Change default to whois.crsnic.net - new Central Shared Registry for domains

Move InterNIC to -i option

2 files changed, 20 insertions, 5 deletions

diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index bdb2e3b..a083496 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -40,7 +40,7 @@
 .Nd Internet domain name and network number directory service
 .Sh SYNOPSIS
 .Nm whois
-.Op Fl adgprR
+.Op Fl adgiprR
 .Op Fl h Ar host
 .Ar name ...
 .Sh DESCRIPTION
@@ -68,8 +68,19 @@ contact for subdomains of
 .Tn \&.GOV .
 .It Fl h Ar host
 Use the specified host instead of the default NIC
-(whois.internic.net).
+(whois.crsnic.net).
 Either a host name or an IP address may be specified.
+.It Fl i
+Use the Network Solutions Registry for Internet Numbers
+.Pq Tn InterNIC
+database.  It contains network numbers and domain contact information
+for most of
+.Tn \&.COM ,
+.Tn \&.NET ,
+.Tn \&.ORG
+and
+.Tn \&.EDU
+domains.
 .It Fl p
 Use the Asia/Pacific Network Information Center
 .Pq Tn APNIC
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index d1a0855..5f33246 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -56,7 +56,8 @@ static const char rcsid[] =
 #include <sysexits.h>
 #include <unistd.h>
 
-#define	NICHOST		"whois.internic.net"
+#define NICHOST         "whois.crsnic.net"
+#define INICHOST        "whois.internic.net"
 #define	DNICHOST	"whois.nic.mil"
 #define	GNICHOST	"whois.nic.gov"
 #define	ANICHOST	"whois.arin.net"
@@ -85,7 +86,7 @@ main(argc, argv)
 #endif
 
 	host = NICHOST;
-	while ((ch = getopt(argc, argv, "adgh:prR")) != -1)
+	while ((ch = getopt(argc, argv, "adgh:iprR")) != -1)
 		switch((char)ch) {
 		case 'a':
 			host = ANICHOST;
@@ -99,6 +100,9 @@ main(argc, argv)
 		case 'h':
 			host = optarg;
 			break;
+		case 'i':
+			host = INICHOST;
+			break;
 		case 'p':
 			host = PNICHOST;
 			break;
@@ -159,6 +163,6 @@ main(argc, argv)
 static void
 usage()
 {
-	fprintf(stderr, "usage: whois [-adgprR] [-h hostname] name ...\n");
+	fprintf(stderr, "usage: whois [-adgiprR] [-h hostname] name ...\n");
 	exit(EX_USAGE);
 }