From adamo@dblab.ece.ntua.gr Fri Mar 26 08:43:57 1999
Return-Path: <adamo@dblab.ece.ntua.gr>
Received: from ulysses.noc.ntua.gr (ulysses.noc.ntua.gr [147.102.222.230])
	by hub.freebsd.org (Postfix) with ESMTP id 1D3D414CC2
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Mar 1999 08:43:47 -0800 (PST)
	(envelope-from adamo@dblab.ece.ntua.gr)
Received: from dblab.ece.ntua.gr (ithaca.dbnet.ece.ntua.gr [147.102.12.1])
	by ulysses.noc.ntua.gr (8.9.3/8.9.3) with ESMTP id SAA22661
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Mar 1999 18:43:24 +0200 (EET)
Received: from hawk.dbnet.ece.ntua.gr (hawk.dbnet.ece.ntua.gr [147.102.12.8])
	by dblab.ece.ntua.gr (8.9.3/8.9.3) with ESMTP id SAA21985
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Mar 1999 18:41:51 +0200 (EET)
Received: (from george@localhost)
	by hawk.dbnet.ece.ntua.gr (8.9.3/8.9.2) id SAA01560;
	Fri, 26 Mar 1999 18:43:24 +0200 (EET)
Message-Id: <199903261643.SAA01560@hawk.dbnet.ece.ntua.gr>
Date: Fri, 26 Mar 1999 18:43:24 +0200 (EET)
From: adamo@dblab.ece.ntua.gr
Reply-To: adamo@dblab.ece.ntua.gr
To: FreeBSD-gnats-submit@freebsd.org
Subject:
X-Send-Pr-Version: 3.2

>Number:         10804
>Category:       misc
>Synopsis:       whois(1) enhancement
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    joe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 26 08:50:00 PST 1999
>Closed-Date:    Thu Jun 14 09:48:53 PDT 2001
>Last-Modified:  Thu Jun 14 09:51:22 PDT 2001
>Originator:     Yiorgos Adamopoulos
>Release:        FreeBSD 3.1-RELEASE i386
>Organization:
Knowledge and Data Base Systems Laboratory, NTUA
>Environment:
>Description:
 
 	<Precise description of the problem (multiple lines)>
 	whois(1) encahncements:
 	-6 switch to support whois.6bone.net
 	-g switch to support whois.nic.gov
 	changed nic.ddn.mil to whois.nic.mil
 	allow for the client to send extra switches to the WHOIS server if this
 	is 6BONE or RIPE.  See http://www.ripe.net/docs/ripe-157.html#toc18
 
>How-To-Repeat:
>Fix:
 	
 	<How to correct or work around the problem, if known (multiple lines)>
 
 *** whois.c.orig	Fri Mar 26 18:07:47 1999
 --- whois.c	Fri Mar 26 18:00:40 1999
 ***************
 *** 57,66 ****
   #include <unistd.h>
   
   #define	NICHOST		"whois.internic.net"
 ! #define	DNICHOST	"nic.ddn.mil"
   #define	ANICHOST	"whois.arin.net"
   #define	RNICHOST	"whois.ripe.net"
   #define	PNICHOST	"whois.apnic.net"
   #define	WHOIS_PORT	43
   
   static void usage __P((void));
 --- 57,68 ----
   #include <unistd.h>
   
   #define	NICHOST		"whois.internic.net"
 ! #define	DNICHOST	"whois.nic.mil"
   #define	ANICHOST	"whois.arin.net"
   #define	RNICHOST	"whois.ripe.net"
   #define	PNICHOST	"whois.apnic.net"
 + #define	GNICHOST	"whois.nic.gov"
 + #define	SNICHOST	"whois.6bone.net"
   #define	WHOIS_PORT	43
   
   static void usage __P((void));
 ***************
 *** 83,89 ****
   #endif
   
   	host = NICHOST;
 ! 	while ((ch = getopt(argc, argv, "adh:pr")) != -1)
   		switch((char)ch) {
   		case 'a':
   			host = ANICHOST;
 --- 85,91 ----
   #endif
   
   	host = NICHOST;
 ! 	while ((ch = getopt(argc, argv, "adh:prg6")) != -1) {
   		switch((char)ch) {
   		case 'a':
   			host = ANICHOST;
 ***************
 *** 100,109 ****
 --- 102,122 ----
   		case 'r':
   			host = RNICHOST;
   			break;
 + 		case 'g':
 + 			host = GNICHOST;
 + 			break;
 + 		case '6':
 + 			host = SNICHOST;
 + 			break;
   		case '?':
   		default:
   			usage();
   		}
 + 
 + 		if ((host == SNICHOST) || (host == RNICHOST)) {
 + 			break;
 + 		}
 + 	}
   	argc -= optind;
   	argv += optind;
   
 ***************
 *** 151,156 ****
   static void
   usage()
   {
 ! 	(void)fprintf(stderr, "usage: whois [-adpr] [-h hostname] name ...\n");
   	exit(EX_USAGE);
   }
 --- 164,169 ----
   static void
   usage()
   {
 ! 	(void)fprintf(stderr, "usage: whois [-adprg6] [-h hostname] name ...\n");
   	exit(EX_USAGE);
   }
 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-bugs 
Responsible-Changed-By: steve 
Responsible-Changed-When: Mon Mar 29 17:47:53 PST 1999 
Responsible-Changed-Why:  
Misfiled PR. 
Responsible-Changed-From-To: freebsd-bugs->billf 
Responsible-Changed-By: billf 
Responsible-Changed-When: Tue Mar 30 11:48:30 PST 1999 
Responsible-Changed-Why:  
I'll look into this, though I think some changes have already been implemented. 
State-Changed-From-To: open->analyzed 
State-Changed-By: billf 
State-Changed-When: Sat Apr 24 20:23:59 PDT 1999 
State-Changed-Why:  
First of all, some of these changes have already been made. 

The patch included compiles cleanly and works well, however 
I need to also patch the man page to reflect both the addition 
of the 6bone(which is easy), and the new optional fields 
for the 6bone and RIPE databases, which is not trivial for 
someone who has minimal experience with mdoc. 

I should commit all of these updates Real Soon Now. 
Responsible-Changed-From-To: billf->joe 
Responsible-Changed-By: joe 
Responsible-Changed-When: Sun Dec 5 14:44:51 PST 1999 
Responsible-Changed-Why:  
Bill, I'm cleaning up all the PRs relating to whois.  I 
hope you don't mind me finishing this one off for you. 
State-Changed-From-To: analyzed->closed 
State-Changed-By: alex 
State-Changed-When: Thu Jun 14 09:48:53 PDT 2001 
State-Changed-Why:  
The manpage has been updated as well. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=10804 
>Unformatted:
