svn commit: r202741 - stable/7/usr.bin/whois

[Edwin Groothuis]

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 at 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);
 }