svn commit: r197823 - stable/6/usr.bin/whois
Doug Barton
dougb at FreeBSD.org
Tue Oct 6 22:21:53 UTC 2009
Author: dougb
Date: Tue Oct 6 22:21:51 2009
New Revision: 197823
URL: http://svn.freebsd.org/changeset/base/197823
Log:
MFC r197725:
The 6bone was decommissioned on 6/6/06, so remove references to it.
Modified:
stable/6/usr.bin/whois/ (props changed)
stable/6/usr.bin/whois/whois.1
stable/6/usr.bin/whois/whois.c
Modified: stable/6/usr.bin/whois/whois.1
==============================================================================
--- stable/6/usr.bin/whois/whois.1 Tue Oct 6 22:19:32 2009 (r197822)
+++ stable/6/usr.bin/whois/whois.1 Tue Oct 6 22:21:51 2009 (r197823)
@@ -32,7 +32,7 @@
.\" From: @(#)whois.1 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd December 11, 2004
+.Dd October 2, 2009
.Dt WHOIS 1
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd "Internet domain name and network number directory service"
.Sh SYNOPSIS
.Nm
-.Op Fl aAbdfgiIklmQrR6
+.Op Fl aAbdfgiIklmQrR
.Op Fl c Ar country-code | Fl h Ar host
.Op Fl p Ar port
.Ar name ...
@@ -211,17 +211,14 @@ This option is deprecated; use the
option with an argument of
.Qq Li RU
instead.
-.It Fl 6
-Use the IPv6 Resource Center
-.Pq Tn 6bone
-database.
-It contains network names and addresses for the IPv6 network.
-.El
.Pp
The operands specified to
.Nm
are treated independently and may be used
as queries on different whois servers.
+.El
+.Sh EXIT STATUS
+.Ex -std
.Sh EXAMPLES
Most types of data, such as domain names and
.Tn IP
@@ -254,15 +251,6 @@ but other
.Tn TLDs
can be queried by using a similar syntax.)
.Pp
-The following example demonstrates how to obtain information about an
-.Tn IPv6
-address or hostname using the
-.Fl 6
-option, which directs the query to
-.Tn 6bone .
-.Pp
-.Dl "whois -6 IPv6-IP-Address"
-.Pp
The following example demonstrates how to query
a whois server using a non-standard port, where
.Dq Li query-data
Modified: stable/6/usr.bin/whois/whois.c
==============================================================================
--- stable/6/usr.bin/whois/whois.c Tue Oct 6 22:19:32 2009 (r197822)
+++ stable/6/usr.bin/whois/whois.c Tue Oct 6 22:21:51 2009 (r197823)
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
#define PNICHOST "whois.apnic.net"
#define MNICHOST "whois.ra.net"
#define QNICHOST_TAIL ".whois-servers.net"
-#define SNICHOST "whois.6bone.net"
#define BNICHOST "whois.registro.br"
#define NORIDHOST "whois.norid.no"
#define IANAHOST "whois.iana.org"
@@ -164,8 +163,10 @@ main(int argc, char *argv[])
warnx("-R is deprecated; use '-c ru' instead");
country = "ru";
break;
+ /* Remove in FreeBSD 10 */
case '6':
- host = SNICHOST;
+ errx(EX_USAGE,
+ "-6 is deprecated; use -[aAflr] instead");
break;
case '?':
default:
More information about the svn-src-stable-6
mailing list