From matt@s02.arpa-canada.net Sat Dec  4 22:16:58 1999
Return-Path: <matt@s02.arpa-canada.net>
Received: from s02.arpa-canada.net (s02.arpa-canada.net [209.104.118.66])
	by hub.freebsd.org (Postfix) with SMTP id E3D9F14EE3
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Dec 1999 22:16:56 -0800 (PST)
	(envelope-from matt@s02.arpa-canada.net)
Received: (qmail 42445 invoked by uid 1000); 5 Dec 1999 06:16:53 -0000
Message-Id: <19991205061653.42444.qmail@s02.arpa-canada.net>
Date: 5 Dec 1999 06:16:53 -0000
From: matt@S02.ARPA-CANADA.NET
Reply-To: matt@S02.ARPA-CANADA.NET
To: FreeBSD-gnats-submit@freebsd.org
Subject: CHANGE-REQUEST: WHOIS(1) - Support Internic.CA (Canada)
X-Send-Pr-Version: 3.2

>Number:         15267
>Category:       bin
>Synopsis:       CHANGE-REQUEST: WHOIS(1) - Support Internic.CA (Canada)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    joe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec  4 22:20:01 PST 1999
>Closed-Date:    Mon Dec 20 06:08:09 PST 1999
>Last-Modified:  Mon Dec 20 06:09:51 PST 1999
>Originator:     Matt
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
N/A
>Environment:

N/A

>Description:

WHOIS(1) had no builtin support for whois.internic.ca which is the Canadian
Internic Registry. As a Canadian, I hate to be left out. Therefore, I added
support for whois.internic.ca via 'whois -c [domain.ca]'

Thanks in advance for (hopefully) accepting this addition.

>How-To-Repeat:

N/A

>Fix:

This is diffed against 3.3-STABLE source, has been tested locally by
myself on 3.3-STABLE machine, manpage update also included and tested.
	
---- START CUT: WHOIS.DIFF ----

diff -urbN whois.old/whois.1 whois/whois.1
--- whois.old/whois.1   Fri Sep 17 10:35:56 1999
+++ whois/whois.1       Sat Dec  4 21:25:51 1999
@@ -40,7 +40,7 @@
 .Nd Internet domain name and network number directory service
 .Sh SYNOPSIS
 .Nm whois
-.Op Fl adgprR
+.Op Fl acdgprR
 .Op Fl h Ar host
 .Ar name ...
 .Sh DESCRIPTION
@@ -58,6 +58,10 @@
 covered neither by
 .Tn APNIC nor by
 .Tn RIPE .
+.It Fl c
+Use the Canadian Internic Registry 
+database. It contains points of contact for subdomains of
+.Tn \&.CA .
 .It Fl d
 Use the US Department of Defense
 database.  It contains points of contact for subdomains of
diff -urbN whois.old/whois.c whois/whois.c
--- whois.old/whois.c   Sat Dec  4 21:21:28 1999
+++ whois/whois.c       Sat Dec  4 21:25:51 1999
@@ -57,6 +57,7 @@
 #include <unistd.h>
 
 #define        NICHOST         "whois.internic.net"
+#define        CNICHOST        "whois.internic.ca"
 #define        DNICHOST        "whois.nic.mil"
 #define        GNICHOST        "whois.nic.gov"
 #define        ANICHOST        "whois.arin.net"
@@ -85,11 +86,14 @@
 #endif
 
        host = NICHOST;
-       while ((ch = getopt(argc, argv, "adgh:prR")) != -1)
+       while ((ch = getopt(argc, argv, "acdgh:prR")) != -1)
                switch((char)ch) {
                case 'a':
                        host = ANICHOST;
                        break;
+               case 'c':
+                       host = CNICHOST;
+                       break;
                case 'd':
                        host = DNICHOST;
                        break;
@@ -159,6 +163,6 @@
 static void
 usage()
 {
-       fprintf(stderr, "usage: whois [-adgprR] [-h hostname] name ...\n");
+       fprintf(stderr, "usage: whois [-acdgprR] [-h hostname] name ...\n");
        exit(EX_USAGE);
 }

--- END CUT: WHOIS.DIFF ---

>Release-Note:
>Audit-Trail:

From: Adam Szilveszter <sziszi@petra.hos.u-szeged.hu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: bin/15267: CHANGE-REQUEST: WHOIS(1) - Support Internic.CA (Canada)
Date: Sun, 5 Dec 1999 07:51:15 +0100

 Hi!
 
 I think you should wait until the whois(1) client gets MFC-d from -CURRENT.
 It will handle this situation and also others just fine! It automatically
 finds the whois server needed for most domains.
 
 I am running it on
 -STABLE already and no problems found this far except for a statement in the
 man page which no longer applies, it says that -i option queries the Network
 Solutions InterNIC database. InterNIC is no longer handled by NS, Inc. The
 client has been updated accordingly a couple of days ago, but not the man
 page, so here it is...:-)
 
 --- whois.1.orig	Fri Dec  3 11:08:49 1999
 +++ whois.1	Sun Dec  5 08:09:23 1999
 @@ -81,7 +81,7 @@
  to whois.crsnic.net provided.
  .It Fl i
  Use the Network Solutions Registry for Internet Numbers
 -.Pq Tn InterNIC
 +.Pq Tn whois.networksolutions.com
  database.  It contains network numbers and domain contact information
  for most of
  .Tn \&.COM ,
 @@ -89,7 +89,13 @@
  .Tn \&.ORG
  and
  .Tn \&.EDU
 -domains.
 +domains. NOTE! The registration of these doamins is now done by a number of
 +independent and competing registrars and this database holds no information
 +on the domains registered by organizations other than Network Solutions, Inc. 
 +Also, note that the InterNIC database
 +.Pq Tn whois.internic.net
 +is no longer handled by Network Solutions, Inc. For details, see:
 +http://www.internic.net/.
  .It Fl m
  Use the Route Arbiter Database
  .Pq Tn RADB
 
 
 
 On Sun, Dec 05, 1999 at 06:16:53AM -0000, matt@S02.ARPA-CANADA.NET wrote:
 > 
 > >Number:         15267
 > >Category:       bin
 > >Synopsis:       CHANGE-REQUEST: WHOIS(1) - Support Internic.CA (Canada)
 > >Confidential:   no
 > >Severity:       non-critical
 > >Priority:       low
 > >Responsible:    freebsd-bugs
 > >State:          open
 > >Quarter:        
 > >Keywords:       
 > >Date-Required:
 > >Class:          change-request
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Sat Dec  4 22:20:01 PST 1999
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Matt
 > >Release:        FreeBSD 3.3-STABLE i386
 > >Organization:
 > N/A
 > >Environment:
 > 
 > N/A
 > 
 > >Description:
 > 
 > WHOIS(1) had no builtin support for whois.internic.ca which is the Canadian
 > Internic Registry. As a Canadian, I hate to be left out. Therefore, I added
 > support for whois.internic.ca via 'whois -c [domain.ca]'
 > 
 > Thanks in advance for (hopefully) accepting this addition.
 > 
 > >How-To-Repeat:
 > 
 > N/A
 > 
 > >Fix:
 > 
 > This is diffed against 3.3-STABLE source, has been tested locally by
 > myself on 3.3-STABLE machine, manpage update also included and tested.
 > 	
 > ---- START CUT: WHOIS.DIFF ----
 > 
 > diff -urbN whois.old/whois.1 whois/whois.1
 > --- whois.old/whois.1   Fri Sep 17 10:35:56 1999
 > +++ whois/whois.1       Sat Dec  4 21:25:51 1999
 > @@ -40,7 +40,7 @@
 >  .Nd Internet domain name and network number directory service
 >  .Sh SYNOPSIS
 >  .Nm whois
 > -.Op Fl adgprR
 > +.Op Fl acdgprR
 >  .Op Fl h Ar host
 >  .Ar name ...
 >  .Sh DESCRIPTION
 > @@ -58,6 +58,10 @@
 >  covered neither by
 >  .Tn APNIC nor by
 >  .Tn RIPE .
 > +.It Fl c
 > +Use the Canadian Internic Registry 
 > +database. It contains points of contact for subdomains of
 > +.Tn \&.CA .
 >  .It Fl d
 >  Use the US Department of Defense
 >  database.  It contains points of contact for subdomains of
 > diff -urbN whois.old/whois.c whois/whois.c
 > --- whois.old/whois.c   Sat Dec  4 21:21:28 1999
 > +++ whois/whois.c       Sat Dec  4 21:25:51 1999
 > @@ -57,6 +57,7 @@
 >  #include <unistd.h>
 >  
 >  #define        NICHOST         "whois.internic.net"
 > +#define        CNICHOST        "whois.internic.ca"
 >  #define        DNICHOST        "whois.nic.mil"
 >  #define        GNICHOST        "whois.nic.gov"
 >  #define        ANICHOST        "whois.arin.net"
 > @@ -85,11 +86,14 @@
 >  #endif
 >  
 >         host = NICHOST;
 > -       while ((ch = getopt(argc, argv, "adgh:prR")) != -1)
 > +       while ((ch = getopt(argc, argv, "acdgh:prR")) != -1)
 >                 switch((char)ch) {
 >                 case 'a':
 >                         host = ANICHOST;
 >                         break;
 > +               case 'c':
 > +                       host = CNICHOST;
 > +                       break;
 >                 case 'd':
 >                         host = DNICHOST;
 >                         break;
 > @@ -159,6 +163,6 @@
 >  static void
 >  usage()
 >  {
 > -       fprintf(stderr, "usage: whois [-adgprR] [-h hostname] name ...\n");
 > +       fprintf(stderr, "usage: whois [-acdgprR] [-h hostname] name ...\n");
 >         exit(EX_USAGE);
 >  }
 > 
 > --- END CUT: WHOIS.DIFF ---
 > 
 > >Release-Note:
 > >Audit-Trail:
 > >Unformatted:
 > 
 > 
 > To Unsubscribe: send mail to majordomo@FreeBSD.org
 > with "unsubscribe freebsd-bugs" in the body of the message
 
 -- 
 -------------------------------------------------------------------------------
                 *** Adam Szilveszter * JATE AJTK Szeged ***
 

From: Jeroen Ruigrok/Asmodai <asmodai@wxs.nl>
To: matt@S02.ARPA-CANADA.NET
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: bin/15267: CHANGE-REQUEST: WHOIS(1) - Support Internic.CA (Canada)
Date: Sun, 5 Dec 1999 13:24:06 +0100

 -On [19991205 08:00], matt@S02.ARPA-CANADA.NET (matt@S02.ARPA-CANADA.NET) wrote:
 >>Description:
 >
 >WHOIS(1) had no builtin support for whois.internic.ca which is the Canadian
 >Internic Registry. As a Canadian, I hate to be left out. Therefore, I added
 >support for whois.internic.ca via 'whois -c [domain.ca]'
 
 While we are there, lets add flags for all TLD registrars.
 
 whois -r won't show me my daily needed .nl domains.
 
 Have you even considered using shell aliases?
 
 alias cawhois='whois -h whois.internic.ca'
 
 [needless to say, I use nlwhois aliases and some others for my whois
 database queries]
 
 -- 
 Jeroen Ruigrok van der Werven/Asmodai           asmodai@[wxs.nl|bart.nl]
 Documentation nutter.          *BSD: Technical excellence at its best...  
 The BSD Programmer's Documentation Project <http://home.wxs.nl/~asmodai>
 Once sent from the Golden Hall...
 
State-Changed-From-To: open->suspended 
State-Changed-By: joe 
State-Changed-When: Sun Dec 5 13:33:27 PST 1999 
State-Changed-Why:  
The new whois in -current already provided equivilent functionality. 
I've suspended this -pr, pending merge of the new whois into -stable. 
Responsible-Changed-From-To: freebsd-bugs->joe 
Responsible-Changed-By: joe 
Responsible-Changed-When: Sun Dec 5 13:36:03 PST 1999 
Responsible-Changed-Why:  
I'm in charge of this one. 
State-Changed-From-To: suspended->closed 
State-Changed-By: joe 
State-Changed-When: Mon Dec 20 06:08:09 PST 1999 
State-Changed-Why:  
The whois client from -current has now been merged into -stable 
in time for the 3.4 release. 
>Unformatted:
