Imported Debian version 4.6.6v4.6.6

9 files changed, 335 insertions, 27 deletions

diff --git a/config.h b/config.h
index 39dfc2d..09d6649 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.6.3"
+#define VERSION "4.6.6"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index 93ce44d..5814d26 100644
--- a/data.h
+++ b/data.h
@@ -40,7 +40,7 @@ const char *ripe_servers_old[] = {
 };
 
 const char *hide_strings[] = {
-    "NOTICE AND TERMS OF USE: You", "VeriSign reserves",	/* VERISIGN */
+    "NOTICE AND TERMS OF USE: You", "Network Solutions reserves",/* VERISIGN */
     "NOTICE: Access to .ORG WHOIS", "time. By submitting",	/* org */
     "NOTICE: Access to .INFO WHOIS", "time. By submitting",	/* info */
     "This Registry database contains ONLY .EDU", "type: help",	/* edu */
@@ -57,7 +57,7 @@ const char *hide_strings[] = {
     "Access to America Online", "time. By accessing",		/* AOL */
     "% Access and use restricted", "% http://www.icann",	/* GANDI */
     "NeuStar, Inc., the Registry", "rules.  For details",	/* us */
-    "The data in this whois", "using our Whois information",	/* enom */
+    "The data in this whois", "Version 6.",			/* enom */
     "By submitting a WHOIS query,", "LACK OF A DOMAIN",		/* directNIC */
     "The Data in OnlineNIC", "\tBy starting this query",	/* OnlineNIC */
     "The data in Bulkregister.com", "you agree to abide", /* bulkregister */
diff --git a/debian/changelog b/debian/changelog
index d3607ae..eccca76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+whois (4.6.6) unstable; urgency=medium
+
+  * Updated polish translation, from Jakub Bogusz of PLD.
+  * Added french translation, from William Steve Applegate. (Closes: #197212)
+  * Added .dj TLD.
+  * Fixed netsol disclaimer strings. (Closes: #195898)
+  * Updated PIR server parser.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 15 Jun 2003 18:47:09 +0200
+
 whois (4.6.5) unstable; urgency=medium
 
   * Added may new ASN blocks from MILNET, LACNIC and JP-NIC.
diff --git a/ip_del_list b/ip_del_list
index c19cd23..1c5380c 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -107,8 +107,10 @@
 203.180.0.0/14	whois.nic.ad.jp
 203.224.0.0/11	whois.nic.or.kr # => 203.255.255.255
 202.0.0.0/7	apnic
+204.0.0.0/14	verio		# rwhois too
 204.0.0.0/6	arin
 208.0.0.0/7	arin
+209.94.192.0/19	lacnic
 210.59.128.0/17	twnic
 210.61.0.0/16	twnic
 210.62.252.0/22	twnic
diff --git a/po/Makefile b/po/Makefile
index 7e8639d..31c868a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,7 +3,7 @@ INSTALLNLSDIR=$(BASEDIR)/usr/share/locale
 
 PACKAGE = whois
 
-CATALOGS = de.mo el.mo es.mo it.mo no.mo pl.mo
+CATALOGS = de.mo el.mo es.mo fr.mo it.mo no.mo pl.mo
 
 POTFILES=../whois.c ../mkpasswd.c
 
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..8c8caed
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,296 @@
+#
+# Traduction de whois.pot
+# Copyright © 2003 William Steve Applegate <wsapplegate@est.un.goret.info>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 4.6.5\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\n"
+"PO-Revision-Date: 2003-06-13 04:16+0200\n"
+"Last-Translator: William Steve Applegate <wsapplegate@est.un.goret.info>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:108
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Version %s.\n"
+"\n"
+"Rapportez les bugs à %s.\n"
+
+#: ../whois.c:151 ../whois.c:224
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Le serveur %s est sélectionné.\n"
+
+#: ../whois.c:172
+#, c-format
+msgid "Using default server %s.\n"
+msgstr "Le serveur par défaut %s est sélectionné.\n"
+
+#: ../whois.c:175
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr "Ce TLD n'a pas de serveur whois, mais vous pouvez accéder à la base de données à"
+
+#: ../whois.c:181
+msgid "This TLD has no whois server."
+msgstr "Ce TLD n'a pas de serveur whois."
+
+#: ../whois.c:185
+msgid "Connecting to whois.crsnic.net."
+msgstr "Connexion à whois.crsnic.net."
+
+#: ../whois.c:191 ../whois.c:202
+#, c-format
+msgid ""
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"Renvoi trouvé vers %s.\n"
+"\n"
+
+#: ../whois.c:196
+msgid "Connecting to whois.nic.cc."
+msgstr "Connexion à whois.nic.cc."
+
+#: ../whois.c:207
+msgid "Connecting to whois.publicinterestregistry.net."
+msgstr "Connexion à whois.publicinterestregistry.net."
+
+#: ../whois.c:213
+#, c-format
+msgid ""
+"\n"
+"Found referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"Renvoi trouvé vers %s.\n"
+"\n"
+
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
+msgstr "Aucun serveur whois n'est connu pour ce type d'objet."
+
+#: ../whois.c:220
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Numéro d'AS ou réseau IP inconnu. Veuillez mettre à jour ce programme."
+
+#: ../whois.c:233
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Requête : \"%s\"\n"
+"\n"
+
+#: ../whois.c:286 ../whois.c:289
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "Impossible d'interpréter la ligne : %s"
+
+#: ../whois.c:428
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Avertissement : des options RIPE ont été utilisées avec un serveur classique."
+
+#: ../whois.c:489
+#, c-format
+msgid "Detected referral to %s on %s.\n"
+msgstr "Renvoi trouvé vers %s depuis %s.\n"
+
+#: ../whois.c:506
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Erreur catastrophique : le texte de déni de responsabilité a changé.\n"
+"Veuillez mettre à jour ce programme.\n"
+
+#: ../whois.c:624
+#, c-format
+msgid "Host %s not found."
+msgstr "L'hôte %s est introuvable."
+
+#: ../whois.c:634
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp : service inconnu"
+
+#: ../whois.c:646
+msgid "Timeout."
+msgstr "Temps limite dépassé."
+
+#: ../whois.c:652
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "Interruption par le signal %d..."
+
+#: ../whois.c:701
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-l                     one level less specific lookup [RPSL only]\n"
+"-L                     find all Less specific matches\n"
+"-m                     find first level more specific matches\n"
+"-M                     find all More specific matches\n"
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match [RPSL only]\n"
+"-d                     return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-i ATTR[,ATTR]...      do an inverse lookup for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned [RPSL only]\n"
+"-r                     turn off recursive lookups for contact information\n"
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     search all databases\n"
+"-s SOURCE[,SOURCE]...  search the database from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+"-t TYPE                request template for object of TYPE ('all' for a "
+"list)\n"
+"-v TYPE                request verbose template for object of TYPE\n"
+"-q [version|sources|types]  query specified server info [RPSL only]\n"
+"-F                     fast raw output (implies -r)\n"
+"-h HOST                connect to server HOST\n"
+"-p PORT                connect to PORT\n"
+"-H                     hide legal disclaimers\n"
+"      --verbose        explain what is being done\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+msgstr ""
+"Usage: whois [OPTION]... OBJET...\n"
+"\n"
+"-l                     réduit d'un niveau la spécificité de la recherche "
+"[RPSL seulement]\n"
+"-L                     trouver toutes les occurrences moins spécifiques\n"
+"-m                     trouver les occurrences de premier niveau plus "
+"spécifiques\n"
+"-M                     trouver toutes les occurrences plus spécifiques\n"
+"-c                     trouver l'occurrence la plus spécifique contenant un "
+"attribut mnt-irt\n"
+"-x                     occurrences exactes [RPSL seulement]\n"
+"-d                     renvoyer aussi les objets de délégation DNS inverse "
+"[RPSL seulement]\n"
+"-i ATTR[,ATTR]...      effectuer une recherche inverse pour les ATTRibuts "
+"spécifiés\n"
+"-T TYPE[,TYPE]...      chercher seulement les objets de ce TYPE\n"
+"-K                     seules les clés primaires sont renvoyées [RPSL "
+"seulement]\n"
+"-r                     désactiver la recherche récursive des informations "
+"de contact\n"
+"-R                     forcer l'affichage de la copie locale de l'objet de "
+"domaine,\n"
+"                       même s'il contient un renvoi\n"
+"-a                     rechercher dans toutes les bases de données\n"
+"-s SOURCE[,SOURCE]...  rechercher dans la base de la SOURCE\n"
+"-g SOURCE:PREM-DERN    trouver les mises à jour de la SOURCE ayant des "
+"numéros de série compris entre PREM et DERN\n"
+"-t TYPE                demander la syntaxe pour les objets de ce TYPE ('all' "
+"donne une liste)\n"
+"-v TYPE                demander la syntaxe détaillée pour les objets de ce "
+"TYPE\n"
+"-q [version|sources|types]  demander les informations spécifiées au serveur "
+"[RPSL seulement]\n"
+"-F                     sortie rapide au format brut (l'option -r est "
+"implicite)\n"
+"-h HOTE                se connecter au serveur HOTE\n"
+"-p PORT                se connecter à ce PORT\n"
+"-H                     cacher les textes légaux de déni de responsabilité\n"
+"      --verbose        détailler les actions entreprises\n"
+"      --help           afficher cette page d'aide et sortir\n"
+"      --version        afficher les informations de version et sortir\n"
+
+#: ../mkpasswd.c:55
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr "\tfonction crypt(3) standard, cryptage DES à 56 bits"
+
+#: ../mkpasswd.c:96
+#, c-format
+msgid "Invalid hash type '%s'.\n"
+msgstr "Le type de hachage '%s' est invalide.\n"
+
+#: ../mkpasswd.c:105
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "Le nombre '%s' est invalide.\n"
+
+#: ../mkpasswd.c:123
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tapez '%s --help' pour plus d'informations.\n"
+
+# : ../mkpasswd.c:152
+#: ../mkpasswd.c:152
+#, c-format
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
+msgstr "Mauvaise taille de graine : %d octet(s) au lieu de %d.\n"
+
+#: ../mkpasswd.c:158
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "Le caractère '%c' est invalide dans la graine.\n"
+
+#: ../mkpasswd.c:172 ../mkpasswd.c:199
+msgid "Password: "
+msgstr "Mot de passe : "
+
+#: ../mkpasswd.c:193
+#, c-format
+msgid "Illegal password character '0x%hhx'.\n"
+msgstr "Le caractère '0x%hhx' est invalide dans le mot de passe.\n"
+
+#: ../mkpasswd.c:230
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"Usage : mkpasswd [OPTIONS]... [MOT DE PASSE [GRAINE]]\n"
+"Crypte le MOT DE PASSE à l'aide de la fonction crypt(3).\n"
+"\n"
+
+#: ../mkpasswd.c:233
+#, c-format
+msgid ""
+"      -H, --hash=TYPE       select hash TYPE\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+"      -P, --password-fd=NUM read the password from file descriptor NUM\n"
+"                            instead of /dev/tty\n"
+"      -s, --stdin           like --password-fd=0\n"
+"      -h, --help            display this help and exit\n"
+"      -V, --version         output version information and exit\n"
+"\n"
+"If PASSWORD is missing then it is asked interactively.\n"
+"If no SALT is specified, a random one is generated.\n"
+"If TYPE is missing available algorithms are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"      -H, --hash=TYPE       sélectionner ce TYPE de hachage\n"
+"      -S, --salt=GRAINE     utiliser cette GRAINE\n"
+"      -P, --password-fd=NUM lire le mot de passe depuis le descripteur de "
+"fichier NUM\n"
+"                            au lieu de /dev/tty\n"
+"      -s, --stdin           équivalent à --password-fd=0\n"
+"      -h, --help            afficher cette page d'aide et sortir\n"
+"      -V, --version         afficher les informations de version et sortir\n"
+"\n"
+"Si le MOT DE PASSE est manquant, il est demandé interactivement.\n"
+"Si aucune GRAINE n'est spécifiée, une graine aléatoire est générée.\n"
+"Si le TYPE est manquant, les algorithmes disponibles sont affichés.\n"
+"\n"
+"Rapportez les bugs à %s.\n"
+
+#: ../mkpasswd.c:260
+msgid "Available algorithms:\n"
+msgstr "Algorithmes disponibles :\n"
diff --git a/po/pl.po b/po/pl.po
index 9e87efb..6365674 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 4.6.3\n"
-"POT-Creation-Date: 2003-05-05 18:21+0200\n"
-"PO-Revision-Date: 2003-04-18 22:14+0200\n"
+"Project-Id-Version: whois 4.6.5\n"
+"POT-Creation-Date: 2003-05-10 08:39+0200\n"
+"PO-Revision-Date: 2003-05-10 08:40+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -62,9 +62,8 @@ msgstr ""
 "\n"
 
 #: ../whois.c:196
-#, fuzzy
 msgid "Connecting to whois.nic.cc."
-msgstr "£±czenie z whois.crsnic.net."
+msgstr "£±czenie z whois.nic.cc."
 
 #: ../whois.c:207
 msgid "Connecting to whois.publicinterestregistry.net."
@@ -107,12 +106,12 @@ msgstr "Nie mo¿na przeanalizowaæ tej linii: %s"
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Uwaga: u¿yto flag RIPE ze starszym serwerem."
 
-#: ../whois.c:489
+#: ../whois.c:487
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Wykryto odniesienie do %s na %s.\n"
 
-#: ../whois.c:506
+#: ../whois.c:504
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -120,26 +119,26 @@ msgstr ""
 "Katastrofa! Tekst o¶wiadczenia zosta³ zmieniony.\n"
 "Proszê uaktualniæ ten program.\n"
 
-#: ../whois.c:624
+#: ../whois.c:622
 #, c-format
 msgid "Host %s not found."
 msgstr "Serwer %s nie zosta³ znaleziony."
 
-#: ../whois.c:634
+#: ../whois.c:632
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: us³uga nieznana"
 
-#: ../whois.c:646
+#: ../whois.c:644
 msgid "Timeout."
 msgstr "Up³yn±³ limit czasu."
 
-#: ../whois.c:652
+#: ../whois.c:650
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Przerwano sygna³em %d..."
 
-#: ../whois.c:701
+#: ../whois.c:699
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
diff --git a/tld_serv_list b/tld_serv_list
index beddc7f..c9a51d0 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -101,7 +101,7 @@
 .cy	NONE		# www.nic.cy
 .cz	whois.nic.cz
 .de	whois.denic.de
-.dj	NONE		# www.nic.dj (NOT YET)
+.dj	whois.domain.dj
 .dk	whois.dk-hostmaster.dk
 .dm	NONE		# www.domains.dm ?
 .do	WEB http://www.nic.do/whois-h.php3
@@ -159,7 +159,7 @@
 #.jm			# NIC? uwimona.edu.jm http://nic.jm
 .jo	WEB http://www.nis.jo/dns/	# old: http://amon.nic.gov.jo/dns/
 .jp	whois.nic.ad.jp
-.ke	NONE		# http://www.nbnet.co.ke/domain.htm
+.ke	NONE		# http://www.kenic.or.ke/
 .kg	whois.domain.kg
 .kh	NONE		# http://www.mptc.gov.kh/Reculation/DNS.htm
 #.ki			# NIC? www.tsk.net.ki
@@ -181,7 +181,7 @@
 .lu	whois.dns.lu
 .lv	whois.nic.lv
 .ly	WEB http://www.lydomains.com/whois.asp
-#.ma			# NIC? http://www.anrt.net.ma/
+#.ma			# NIC? http://www.anrt.net.ma/nic/
 .mc	whois.ripe.net
 .md	WEB http://www.nic.md/search.html
 .mg	NONE		# www.nic.mg
@@ -206,7 +206,7 @@
 .nc	whois.cctld.nc
 #.ne			# NIC? http://www.intnet.ne
 .nf	NONE		# http://www.names.nf
-.ng	whois.rg.net
+.ng	NONE		# http://psg.com/dns/ng/
 .ni	NONE		# www.nic.ni
 .nl	whois.domain-registry.nl
 .no	whois.norid.no
@@ -237,7 +237,7 @@
 .sa	saudinic.net.sa
 .sb	WEB http://www.nic.net.sb/search.htm
 .sc	NONE		# www.nic.sc
-#.sd			# NIC? http://www.sudatel.sd
+.sd	NONE		# http://www.sudatel.sd - not functional
 .se	whois.nic-se.se
 .sg	whois.nic.net.sg
 .sh	whois.nic.sh
@@ -255,7 +255,7 @@
 #.sy			# NIC? (usually offline?)
 .sz	NONE		# http://www.sispa.org.sz/
 .tc	whois.adamsnames.tc
-#.td			# NIC? http://www.tit.td
+.td	NONE		# www.nic.td
 .tf	whois.adamsnames.tc
 .tg	WEB http://www.nic.tg/
 .th	whois.thnic.net
@@ -271,7 +271,7 @@
 .tw	whois.twnic.net
 .tz	NONE		# http://www.psg.com/dns/tz/
 .ua	whois.net.ua
-.ug	www.registry.co.ug
+.ug	WEB http://www.registry.co.ug/whois/
 .gov.uk	whois.ja.net
 .ac.uk	whois.ja.net
 .uk	whois.nic.uk
diff --git a/whois.c b/whois.c
index 3d65c59..0bcd855 100644
--- a/whois.c
+++ b/whois.c
@@ -520,6 +520,8 @@ const char *query_crsnic(const int sock, const char *query)
     if (write(sock, temp, strlen(temp)) < 0)
 	err_sys("write");
     while (fgets(buf, sizeof(buf), fi)) {
+	if (strncmp(buf, "No match for \"", 14) == 0)	/* ugly */
+	    fputs(buf, stdout);
 	/* If there are multiple matches only the server of the first record
 	   is queried */
 	if (state == 0 && strncmp(buf, "   Domain Name:", 15) == 0)
@@ -563,10 +565,10 @@ const char *query_pir(const int sock, const char *query)
 	/* If there are multiple matches only the server of the first record
 	   is queried */
 	if (state == 0 &&
-    strncmp(buf, "Registrant Name:CONTACT NOT AUTHORITATIVE", 15) == 0)
+    strncmp(buf, "Registrant Name:SEE SPONSORING REGISTRAR", 40) == 0)
 	    state = 1;
 	if (state == 1 &&
-    strncmp(buf, "Registrant Street1:Whois Server:", 16) == 0) {
+		strncmp(buf, "Registrant Street1:Whois Server:", 32) == 0) {
 	    char *p, *q;
 
 	    for (p = buf; *p != ':'; p++);	/* skip until colon */
@@ -577,8 +579,7 @@ const char *query_pir(const int sock, const char *query)
 	    *q = '\0';
 	    state = 2;
 	}
-	if (verb)
-	    fputs(buf, stdout);
+	fputs(buf, stdout);
     }
     if (ferror(fi))
 	err_sys("fgets");