2 files changed, 33 insertions, 10 deletions

diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index fafd1d05288f..c58a8cd5a454 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\"	$Id: whois.1,v 1.6 1999/02/02 01:49:14 ache Exp $
 .\"
-.Dd February 19, 1998
+.Dd February 1, 1999
 .Dt WHOIS 1
 .Os BSD 4.3
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nd Internet domain name and network number directory service
 .Sh SYNOPSIS
 .Nm whois
-.Op Fl adpr
+.Op Fl adgprR
 .Op Fl h Ar host
 .Ar name ...
 .Sh DESCRIPTION
@@ -59,10 +59,13 @@ covered neither by
 .Tn APNIC nor by
 .Tn RIPE .
 .It Fl d
-Use the (US Military) Defense Data Network
-.Pq Tn DDN
+Use the US Department of Defense
 database.  It contains points of contact for subdomains of
 .Tn \&.MIL .
+.It Fl g
+Use the US non-military federal government database, which contains points of
+contact for subdomains of
+.Tn \&.GOV .
 .It Fl h Ar host
 Use the specified host instead of the default NIC
 (whois.internic.net).
@@ -77,6 +80,12 @@ Use the R\(aaeseaux IP Europ\(aaeens
 .Pq Tn RIPE
 database.  It contains network numbers and domain contact information
 for Europe.
+.It Fl R
+Use the Russia Network Information Center
+.Pq Tn RIPN
+database.  It contains network numbers and domain contact information
+for subdomains of
+.Tn \&.RU .
 .El
 .Pp
 The operands specified to
@@ -98,7 +107,13 @@ operands have special meaning, and how to guide the search, use
 the special name
 .Dq Ar help .
 .Sh SEE ALSO
-RFC 812: Nicname/Whois
+.Rs
+.%A Ken Harrenstien
+.%A Vic White
+.%T NICNAME/WHOIS
+.%D 1 March 1982
+.%O RFC 812
+.Re
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index ed5e5bc2b5a0..4fecb4219a98 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: whois.c,v 1.5 1998/02/19 19:07:50 wollman Exp $";
+	"$Id: whois.c,v 1.8 1999/02/02 01:49:14 ache Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -57,10 +57,12 @@ static const char rcsid[] =
 #include <unistd.h>
 
 #define	NICHOST		"whois.internic.net"
-#define	DNICHOST	"nic.ddn.mil"
+#define	DNICHOST	"whois.nic.mil"
+#define	GNICHOST	"whois.nic.gov"
 #define	ANICHOST	"whois.arin.net"
 #define	RNICHOST	"whois.ripe.net"
 #define	PNICHOST	"whois.apnic.net"
+#define RUNICHOST       "whois.ripn.net"
 #define	WHOIS_PORT	43
 
 static void usage __P((void));
@@ -83,7 +85,7 @@ main(argc, argv)
 #endif
 
 	host = NICHOST;
-	while ((ch = getopt(argc, argv, "adh:pr")) != -1)
+	while ((ch = getopt(argc, argv, "adgh:prR")) != -1)
 		switch((char)ch) {
 		case 'a':
 			host = ANICHOST;
@@ -91,6 +93,9 @@ main(argc, argv)
 		case 'd':
 			host = DNICHOST;
 			break;
+		case 'g':
+			host = GNICHOST;
+			break;
 		case 'h':
 			host = optarg;
 			break;
@@ -100,6 +105,9 @@ main(argc, argv)
 		case 'r':
 			host = RNICHOST;
 			break;
+		case 'R':
+			host = RUNICHOST;
+			break;
 		case '?':
 		default:
 			usage();
@@ -151,6 +159,6 @@ main(argc, argv)
 static void
 usage()
 {
-	(void)fprintf(stderr, "usage: whois [-adpr] [-h hostname] name ...\n");
+	fprintf(stderr, "usage: whois [-adgprR] [-h hostname] name ...\n");
 	exit(EX_USAGE);
 }