From danm@prime.gushi.org  Sat Jan  9 00:25:17 2010
Return-Path: <danm@prime.gushi.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C37931065697
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  9 Jan 2010 00:25:17 +0000 (UTC)
	(envelope-from danm@prime.gushi.org)
Received: from prime.gushi.org (prime.gushi.org [72.9.101.130])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F8FA8FC25
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  9 Jan 2010 00:25:17 +0000 (UTC)
Received: from prime.gushi.org (localhost [127.0.0.1])
	by prime.gushi.org (8.14.1/8.14.1) with ESMTP id o090PCeW058567
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 8 Jan 2010 19:25:16 -0500 (EST)
	(envelope-from danm@prime.gushi.org)
Received: (from danm@localhost)
	by prime.gushi.org (8.14.1/8.14.1/Submit) id o090P4IK058536;
	Fri, 8 Jan 2010 19:25:04 -0500 (EST)
	(envelope-from danm)
Message-Id: <201001090025.o090P4IK058536@prime.gushi.org>
Date: Fri, 8 Jan 2010 19:25:04 -0500 (EST)
From: Dan Mahoney <danm@prime.gushi.org>
Reply-To: Dan Mahoney <danm@prime.gushi.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Whois -d option
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142507
>Category:       bin
>Synopsis:       Whois -d option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 09 00:30:04 UTC 2010
>Closed-Date:    Thu Jan 21 10:17:08 UTC 2010
>Last-Modified:  Thu Jan 21 10:20:14 UTC 2010
>Originator:     Dan Mahoney
>Release:        FreeBSD 6.4-STABLE i386
>Organization:
Gushi Systems
>Environment:
System: FreeBSD prime.gushi.org 6.4-STABLE FreeBSD 6.4-STABLE #1: Sat Mar 7 23:54:27 EST 2009 danm@prime.gushi.org:/usr/src/sys/i386/compile/PRIME6 
i386

>Description:
Whois includes the -d option to query the DOD database at whois.nic.mil.  The database is no longer in DNS and AFAICT no longer exists.

>How-To-Repeat:

whois -d nic.mil

>Fix:

I've tried contacting nic.mil for answers, haven't gotten any, don't seriously expect any.

Note: Please delete the incomplete PR I sent a few minutes ago (it didn't include my email address).
>Release-Note:
>Audit-Trail:

From: Edwin Groothuis <edwin@mavetju.org>
To: Dan Mahoney <danm@prime.gushi.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: bin/142507: Whois -d option
Date: Thu, 14 Jan 2010 20:40:41 +1100

 On Fri, Jan 08, 2010 at 07:25:04PM -0500, Dan Mahoney wrote:
 > >Description:
 > Whois includes the -d option to query the DOD database at
 > whois.nic.mil.  The database is no longer in DNS and AFAICT no
 > longer exists.
 
 Same with .gov:
 
 [~] edwin@k7>whois nih.gov
 whois: gov.whois-servers.net: Non-recoverable failure in name resolution
 
 According to other mailinglists, the whois servers for .gov also
 don't exist anymore.
 
 Edwin
 
 -- 
 Edwin Groothuis		Website: http://www.mavetju.org/
 edwin@mavetju.org	Weblog:  http://www.mavetju.org/weblog/
State-Changed-From-To: open->patched 
State-Changed-By: edwin 
State-Changed-When: Thu Jan 14 10:41:21 UTC 2010 
State-Changed-Why:  
Patched in head 


Responsible-Changed-From-To: freebsd-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 14 10:41:21 UTC 2010 
Responsible-Changed-Why:  
I will take care of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142507 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142507: commit references a PR
Date: Thu, 14 Jan 2010 10:41:09 +0000 (UTC)

 Author: edwin
 Date: Thu Jan 14 10:40:54 2010
 New Revision: 202280
 URL: http://svn.freebsd.org/changeset/base/202280
 
 Log:
   Remove -d option, whois.nic.mil doesn't exist anymore.
   
   PR:		bin/142507
   Submitted by:	Dan Mahoney <danm@prime.gushi.org>
   MFC after:	1 week
 
 Modified:
   head/usr.bin/whois/whois.1
   head/usr.bin/whois/whois.c
 
 Modified: head/usr.bin/whois/whois.1
 ==============================================================================
 --- head/usr.bin/whois/whois.1	Thu Jan 14 10:00:01 2010	(r202279)
 +++ head/usr.bin/whois/whois.1	Thu Jan 14 10:40:54 2010	(r202280)
 @@ -40,7 +40,7 @@
  .Nd "Internet domain name and network number directory service"
  .Sh SYNOPSIS
  .Nm
 -.Op Fl aAbdfgiIklmQrR
 +.Op Fl aAbfgiIklmQrR
  .Op Fl c Ar country-code | Fl h Ar host
  .Op Fl p Ar port
  .Ar name ...
 @@ -82,11 +82,6 @@ This is the equivalent of using the
  .Fl h
  option with an argument of
  .Qq Ar country-code Ns Li .whois-servers.net .
 -.It Fl d
 -Use the US Department of Defense
 -database.
 -It contains points of contact for subdomains of
 -.Pa .MIL .
  .It Fl f
  Use the African Network Information Centre
  .Pq Tn AfriNIC
 
 Modified: head/usr.bin/whois/whois.c
 ==============================================================================
 --- head/usr.bin/whois/whois.c	Thu Jan 14 10:00:01 2010	(r202279)
 +++ head/usr.bin/whois/whois.c	Thu Jan 14 10:40:54 2010	(r202280)
 @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
  #define	ABUSEHOST	"whois.abuse.net"
  #define	NICHOST		"whois.crsnic.net"
  #define	INICHOST	"whois.networksolutions.com"
 -#define	DNICHOST	"whois.nic.mil"
  #define	GNICHOST	"whois.nic.gov"
  #define	ANICHOST	"whois.arin.net"
  #define	LNICHOST	"whois.lacnic.net"
 @@ -109,7 +108,7 @@ main(int argc, char *argv[])
  
  	country = host = qnichost = NULL;
  	flags = use_qnichost = 0;
 -	while ((ch = getopt(argc, argv, "aAbc:dfgh:iIklmp:QrR6")) != -1) {
 +	while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:QrR6")) != -1) {
  		switch (ch) {
  		case 'a':
  			host = ANICHOST;
 @@ -123,9 +122,6 @@ main(int argc, char *argv[])
  		case 'c':
  			country = optarg;
  			break;
 -		case 'd':
 -			host = DNICHOST;
 -			break;
  		case 'f':
  			host = FNICHOST;
  			break;
 @@ -364,7 +360,7 @@ static void
  usage(void)
  {
  	fprintf(stderr,
 -	    "usage: whois [-aAbdfgiIklmQrR6] [-c country-code | -h hostname] "
 +	    "usage: whois [-aAbfgiIklmQrR6] [-c country-code | -h hostname] "
  	    "[-p port] name ...\n");
  	exit(EX_USAGE);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: edwin 
State-Changed-When: Thu Jan 21 10:16:59 UTC 2010 
State-Changed-Why:  
Commited, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142507 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142507: commit references a PR
Date: Thu, 21 Jan 2010 10:16:43 +0000 (UTC)

 Author: edwin
 Date: Thu Jan 21 10:16:21 2010
 New Revision: 202740
 URL: http://svn.freebsd.org/changeset/base/202740
 
 Log:
   MFC of 202280, 202281
   
   - Remove -d option, whois.nic.mil doesn't exist anymore.
   
   - Make whois capable of searching for IPv6 addresses just like it can
     do for IPv4 addresses without having to explicetly specify that the
     ARIN server should be used to get the initial information.
   
   PR:		bin/142507, bin/128725
   Submitted by:	Dan Mahoney <danm@prime.gushi.org>, "Matt D. Harris" <mdh_lists@yahoo.com>
 
 Modified:
   stable/8/usr.bin/whois/whois.1
   stable/8/usr.bin/whois/whois.c
 Directory Properties:
   stable/8/usr.bin/whois/   (props changed)
 
 Modified: stable/8/usr.bin/whois/whois.1
 ==============================================================================
 --- stable/8/usr.bin/whois/whois.1	Thu Jan 21 10:12:21 2010	(r202739)
 +++ stable/8/usr.bin/whois/whois.1	Thu Jan 21 10:16:21 2010	(r202740)
 @@ -40,7 +40,7 @@
  .Nd "Internet domain name and network number directory service"
  .Sh SYNOPSIS
  .Nm
 -.Op Fl aAbdfgiIklmQrR
 +.Op Fl aAbfgiIklmQrR
  .Op Fl c Ar country-code | Fl h Ar host
  .Op Fl p Ar port
  .Ar name ...
 @@ -82,11 +82,6 @@ This is the equivalent of using the
  .Fl h
  option with an argument of
  .Qq Ar country-code Ns Li .whois-servers.net .
 -.It Fl d
 -Use the US Department of Defense
 -database.
 -It contains points of contact for subdomains of
 -.Pa .MIL .
  .It Fl f
  Use the African Network Information Centre
  .Pq Tn AfriNIC
 
 Modified: stable/8/usr.bin/whois/whois.c
 ==============================================================================
 --- stable/8/usr.bin/whois/whois.c	Thu Jan 21 10:12:21 2010	(r202739)
 +++ stable/8/usr.bin/whois/whois.c	Thu Jan 21 10:16:21 2010	(r202740)
 @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
  #define	ABUSEHOST	"whois.abuse.net"
  #define	NICHOST		"whois.crsnic.net"
  #define	INICHOST	"whois.networksolutions.com"
 -#define	DNICHOST	"whois.nic.mil"
  #define	GNICHOST	"whois.nic.gov"
  #define	ANICHOST	"whois.arin.net"
  #define	LNICHOST	"whois.lacnic.net"
 @@ -109,7 +108,7 @@ main(int argc, char *argv[])
  
  	country = host = qnichost = NULL;
  	flags = use_qnichost = 0;
 -	while ((ch = getopt(argc, argv, "aAbc:dfgh:iIklmp:QrR6")) != -1) {
 +	while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:QrR6")) != -1) {
  		switch (ch) {
  		case 'a':
  			host = ANICHOST;
 @@ -123,9 +122,6 @@ main(int argc, char *argv[])
  		case 'c':
  			country = optarg;
  			break;
 -		case 'd':
 -			host = DNICHOST;
 -			break;
  		case 'f':
  			host = FNICHOST;
  			break;
 @@ -219,6 +215,10 @@ choose_server(char *domain)
  {
  	char *pos, *retval;
  
 +	if (strchr(domain, ':')) {
 +		s_asprintf(&retval, "%s", ANICHOST);
 +		return (retval);
 +	}
  	for (pos = strchr(domain, '\0'); pos > domain && *--pos == '.';)
  		*pos = '\0';
  	if (*domain == '\0')
 @@ -364,7 +364,7 @@ static void
  usage(void)
  {
  	fprintf(stderr,
 -	    "usage: whois [-aAbdfgiIklmQrR6] [-c country-code | -h hostname] "
 +	    "usage: whois [-aAbfgiIklmQrR6] [-c country-code | -h hostname] "
  	    "[-p port] name ...\n");
  	exit(EX_USAGE);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142507: commit references a PR
Date: Thu, 21 Jan 2010 10:16:59 +0000 (UTC)

 Author: edwin
 Date: Thu Jan 21 10:16:32 2010
 New Revision: 202741
 URL: http://svn.freebsd.org/changeset/base/202741
 
 Log:
   MFC of 202280, 202281
   
   - Remove -d option, whois.nic.mil doesn't exist anymore.
   
   - Make whois capable of searching for IPv6 addresses just like it can
     do for IPv4 addresses without having to explicetly specify that the
     ARIN server should be used to get the initial information.
   
   PR:             bin/142507, bin/128725
   Submitted by:   Dan Mahoney <danm@prime.gushi.org>, "Matt D. Harris" <mdh_lists@
 
 Modified:
   stable/7/usr.bin/whois/whois.1
   stable/7/usr.bin/whois/whois.c
 Directory Properties:
   stable/7/usr.bin/whois/   (props changed)
 
 Modified: stable/7/usr.bin/whois/whois.1
 ==============================================================================
 --- stable/7/usr.bin/whois/whois.1	Thu Jan 21 10:16:21 2010	(r202740)
 +++ stable/7/usr.bin/whois/whois.1	Thu Jan 21 10:16:32 2010	(r202741)
 @@ -40,7 +40,7 @@
  .Nd "Internet domain name and network number directory service"
  .Sh SYNOPSIS
  .Nm
 -.Op Fl aAbdfgiIklmQrR
 +.Op Fl aAbfgiIklmQrR
  .Op Fl c Ar country-code | Fl h Ar host
  .Op Fl p Ar port
  .Ar name ...
 @@ -82,11 +82,6 @@ This is the equivalent of using the
  .Fl h
  option with an argument of
  .Qq Ar country-code Ns Li .whois-servers.net .
 -.It Fl d
 -Use the US Department of Defense
 -database.
 -It contains points of contact for subdomains of
 -.Pa .MIL .
  .It Fl f
  Use the African Network Information Centre
  .Pq Tn AfriNIC
 
 Modified: stable/7/usr.bin/whois/whois.c
 ==============================================================================
 --- stable/7/usr.bin/whois/whois.c	Thu Jan 21 10:16:21 2010	(r202740)
 +++ stable/7/usr.bin/whois/whois.c	Thu Jan 21 10:16:32 2010	(r202741)
 @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
  #define	ABUSEHOST	"whois.abuse.net"
  #define	NICHOST		"whois.crsnic.net"
  #define	INICHOST	"whois.networksolutions.com"
 -#define	DNICHOST	"whois.nic.mil"
  #define	GNICHOST	"whois.nic.gov"
  #define	ANICHOST	"whois.arin.net"
  #define	LNICHOST	"whois.lacnic.net"
 @@ -109,7 +108,7 @@ main(int argc, char *argv[])
  
  	country = host = qnichost = NULL;
  	flags = use_qnichost = 0;
 -	while ((ch = getopt(argc, argv, "aAbc:dfgh:iIklmp:QrR6")) != -1) {
 +	while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:QrR6")) != -1) {
  		switch (ch) {
  		case 'a':
  			host = ANICHOST;
 @@ -123,9 +122,6 @@ main(int argc, char *argv[])
  		case 'c':
  			country = optarg;
  			break;
 -		case 'd':
 -			host = DNICHOST;
 -			break;
  		case 'f':
  			host = FNICHOST;
  			break;
 @@ -219,6 +215,10 @@ choose_server(char *domain)
  {
  	char *pos, *retval;
  
 +	if (strchr(domain, ':')) {
 +		s_asprintf(&retval, "%s", ANICHOST);
 +		return (retval);
 +	}
  	for (pos = strchr(domain, '\0'); pos > domain && *--pos == '.';)
  		*pos = '\0';
  	if (*domain == '\0')
 @@ -364,7 +364,7 @@ static void
  usage(void)
  {
  	fprintf(stderr,
 -	    "usage: whois [-aAbdfgiIklmQrR6] [-c country-code | -h hostname] "
 +	    "usage: whois [-aAbfgiIklmQrR6] [-c country-code | -h hostname] "
  	    "[-p port] name ...\n");
  	exit(EX_USAGE);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142507: commit references a PR
Date: Thu, 21 Jan 2010 10:17:07 +0000 (UTC)

 Author: edwin
 Date: Thu Jan 21 10:16:49 2010
 New Revision: 202742
 URL: http://svn.freebsd.org/changeset/base/202742
 
 Log:
   MFC of 202280, 202281
   
   - Remove -d option, whois.nic.mil doesn't exist anymore.
   
   - Make whois capable of searching for IPv6 addresses just like it can
     do for IPv4 addresses without having to explicetly specify that the
     ARIN server should be used to get the initial information.
   
   PR:             bin/142507, bin/128725
   Submitted by:   Dan Mahoney <danm@prime.gushi.org>, "Matt D. Harris" <mdh_lists@
 
 Modified:
   stable/6/usr.bin/whois/whois.1
   stable/6/usr.bin/whois/whois.c
 Directory Properties:
   stable/6/usr.bin/whois/   (props changed)
 
 Modified: stable/6/usr.bin/whois/whois.1
 ==============================================================================
 --- stable/6/usr.bin/whois/whois.1	Thu Jan 21 10:16:32 2010	(r202741)
 +++ stable/6/usr.bin/whois/whois.1	Thu Jan 21 10:16:49 2010	(r202742)
 @@ -40,7 +40,7 @@
  .Nd "Internet domain name and network number directory service"
  .Sh SYNOPSIS
  .Nm
 -.Op Fl aAbdfgiIklmQrR
 +.Op Fl aAbfgiIklmQrR
  .Op Fl c Ar country-code | Fl h Ar host
  .Op Fl p Ar port
  .Ar name ...
 @@ -82,11 +82,6 @@ This is the equivalent of using the
  .Fl h
  option with an argument of
  .Qq Ar country-code Ns Li .whois-servers.net .
 -.It Fl d
 -Use the US Department of Defense
 -database.
 -It contains points of contact for subdomains of
 -.Pa .MIL .
  .It Fl f
  Use the African Network Information Centre
  .Pq Tn AfriNIC
 
 Modified: stable/6/usr.bin/whois/whois.c
 ==============================================================================
 --- stable/6/usr.bin/whois/whois.c	Thu Jan 21 10:16:32 2010	(r202741)
 +++ stable/6/usr.bin/whois/whois.c	Thu Jan 21 10:16:49 2010	(r202742)
 @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
  #define	ABUSEHOST	"whois.abuse.net"
  #define	NICHOST		"whois.crsnic.net"
  #define	INICHOST	"whois.networksolutions.com"
 -#define	DNICHOST	"whois.nic.mil"
  #define	GNICHOST	"whois.nic.gov"
  #define	ANICHOST	"whois.arin.net"
  #define	LNICHOST	"whois.lacnic.net"
 @@ -109,7 +108,7 @@ main(int argc, char *argv[])
  
  	country = host = qnichost = NULL;
  	flags = use_qnichost = 0;
 -	while ((ch = getopt(argc, argv, "aAbc:dfgh:iIklmp:QrR6")) != -1) {
 +	while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:QrR6")) != -1) {
  		switch (ch) {
  		case 'a':
  			host = ANICHOST;
 @@ -123,9 +122,6 @@ main(int argc, char *argv[])
  		case 'c':
  			country = optarg;
  			break;
 -		case 'd':
 -			host = DNICHOST;
 -			break;
  		case 'f':
  			host = FNICHOST;
  			break;
 @@ -219,6 +215,10 @@ choose_server(char *domain)
  {
  	char *pos, *retval;
  
 +	if (strchr(domain, ':')) {
 +		s_asprintf(&retval, "%s", ANICHOST);
 +		return (retval);
 +	}
  	for (pos = strchr(domain, '\0'); pos > domain && *--pos == '.';)
  		*pos = '\0';
  	if (*domain == '\0')
 @@ -362,7 +362,7 @@ static void
  usage(void)
  {
  	fprintf(stderr,
 -	    "usage: whois [-aAbdfgiIklmQrR6] [-c country-code | -h hostname] "
 +	    "usage: whois [-aAbfgiIklmQrR6] [-c country-code | -h hostname] "
  	    "[-p port] name ...\n");
  	exit(EX_USAGE);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
