From joe@storm.FreeBSD.org.uk Wed Aug 18 14:56:26 1999
Return-Path: <joe@storm.FreeBSD.org.uk>
Received: from storm.FreeBSD.org.uk (storm.freebsd.org.uk [194.242.128.198])
	by hub.freebsd.org (Postfix) with ESMTP id C66EE14CAA
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Aug 1999 14:56:24 -0700 (PDT)
	(envelope-from joe@storm.FreeBSD.org.uk)
Received: (from joe@localhost)
	by storm.FreeBSD.org.uk (8.9.3/8.9.3) id WAA90914;
	Wed, 18 Aug 1999 22:56:56 +0100 (BST)
	(envelope-from joe)
Message-Id: <199908182156.WAA90914@storm.FreeBSD.org.uk>
Date: Wed, 18 Aug 1999 22:56:56 +0100 (BST)
From: joe@FreeBSD.org.uk
Sender: joe@storm.FreeBSD.org.uk
Reply-To: joe@FreeBSD.org.uk
To: FreeBSD-gnats-submit@freebsd.org
Subject: Patch for whois to use UK Nominet database.
X-Send-Pr-Version: 3.2

>Number:         13236
>Category:       bin
>Synopsis:       Patch for whois to use UK Nominet database.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    joe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 18 15:00:01 PDT 1999
>Closed-Date:    Sun Dec 5 13:32:27 PST 1999
>Last-Modified:  Sun Dec  5 13:33:14 PST 1999
>Originator:     Joe Karthauser
>Release:        FreeBSD 3.2-STABLE i386
>Organization:
Pavilion Internet/FreeBSD (UK)
>Environment:
>Description:

	It would be nice if whois was able to query the UK
	Nominet whois database.  Patches below ;)

>How-To-Repeat:
>Fix:
	
	Apply the following patches :)


Index: whois.1
===================================================================
RCS file: /home/ncvs/src/usr.bin/whois/whois.1,v
retrieving revision 1.6
diff -u -r1.6 whois.1
--- whois.1	1999/02/02 01:49:14	1.6
+++ whois.1	1999/08/18 21:53:41
@@ -86,6 +86,10 @@
 database.  It contains network numbers and domain contact information
 for subdomains of
 .Tn \&.RU .
+.It Fl u
+Use the Nominet Network Information Center
+.Pq Tn NIC.UK
+database.  It contains domain contact information for the UK.
 .El
 .Pp
 The operands specified to
Index: whois.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/whois/whois.c,v
retrieving revision 1.8
diff -u -r1.8 whois.c
--- whois.c	1999/02/02 01:49:14	1.8
+++ whois.c	1999/08/18 21:50:31
@@ -63,6 +63,7 @@
 #define	RNICHOST	"whois.ripe.net"
 #define	PNICHOST	"whois.apnic.net"
 #define RUNICHOST       "whois.ripn.net"
+#define UNICHOST        "whois.nic.uk"
 #define	WHOIS_PORT	43
 
 static void usage __P((void));
@@ -85,7 +86,7 @@
 #endif
 
 	host = NICHOST;
-	while ((ch = getopt(argc, argv, "adgh:prR")) != -1)
+	while ((ch = getopt(argc, argv, "adgh:prRu")) != -1)
 		switch((char)ch) {
 		case 'a':
 			host = ANICHOST;
@@ -108,6 +109,9 @@
 		case 'R':
 			host = RUNICHOST;
 			break;
+		case 'u':
+			host = UNICHOST;
+			break;
 		case '?':
 		default:
 			usage();
@@ -159,6 +163,6 @@
 static void
 usage()
 {
-	fprintf(stderr, "usage: whois [-adgprR] [-h hostname] name ...\n");
+	fprintf(stderr, "usage: whois [-adgprRu] [-h hostname] name ...\n");
 	exit(EX_USAGE);
 }

>Release-Note:
>Audit-Trail:

From: Chris Piazza <cpiazza@home.net>
To: joe@FreeBSD.org.uk
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: bin/13236: Patch for whois to use UK Nominet database.
Date: Wed, 18 Aug 1999 15:45:06 -0700

 On Wed, Aug 18, 1999 at 10:56:56PM +0100, joe@FreeBSD.org.uk wrote:
 > 
 > 	It would be nice if whois was able to query the UK
 > 	Nominet whois database.  Patches below ;)
 
 Which brings up a question: do we really need more?  We can either
 disallow more and just say 'use -h blah' or add a zillion of
 them (CDNNNET(canada)..heck even NetNames Polska!).  What do
 you think?
 
 -Chris 
 -- 
 cpiazza@home.net              cpiazza@FreeBSD.org
 "It's better to be quotable than to be honest."
                                    --Tom Stoppard
 
Responsible-Changed-From-To: freebsd-bugs->billf 
Responsible-Changed-By: billf 
Responsible-Changed-When: Wed Aug 18 16:33:15 PDT 1999 
Responsible-Changed-Why:  
I have another whois(1) change queued up somewhere. 

From: Josef Karthauser <joe@pavilion.net>
To: Chris Piazza <cpiazza@home.net>
Cc: joe@FreeBSD.org.uk, FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: bin/13236: Patch for whois to use UK Nominet database.
Date: Thu, 19 Aug 1999 09:49:29 +0100

 On Wed, Aug 18, 1999 at 03:45:06PM -0700, Chris Piazza wrote:
 > On Wed, Aug 18, 1999 at 10:56:56PM +0100, joe@FreeBSD.org.uk wrote:
 > > 
 > > 	It would be nice if whois was able to query the UK
 > > 	Nominet whois database.  Patches below ;)
 > 
 > Which brings up a question: do we really need more?  We can either
 > disallow more and just say 'use -h blah' or add a zillion of
 > them (CDNNNET(canada)..heck even NetNames Polska!).  What do
 > you think?
 
 Everyone would like to be able to use their local databases easily
 without having to type them in all the time under -h.  Perhaps a
 configuration file would be better, therefore each site can have local
 customisations.  On the other hand there are plenty of option strings
 left, so why not put them all in?
 
 Joe
 -- 
 Josef Karthauser	FreeBSD: How many times have you booted today?
 Technical Manager	Viagra for your server (http://www.uk.freebsd.org)
 Pavilion Internet plc.  [joe@pavilion.net, joe@uk.freebsd.org, joe@tao.org.uk]
 
Responsible-Changed-From-To: billf->joe 
Responsible-Changed-By: billf 
Responsible-Changed-When: Fri Nov 12 20:26:59 PST 1999 
Responsible-Changed-Why:  
Submitter is now committer. 
State-Changed-From-To: open->closed 
State-Changed-By: joe 
State-Changed-When: Sun Dec 5 13:32:27 PST 1999 
State-Changed-Why:  
Whois in -current now adds this functionality using .whois-servers.net 
lookups. 
>Unformatted:
