Imported Debian version 4.5.33v4.5.33

14 files changed, 205 insertions, 174 deletions

diff --git a/as_del_list b/as_del_list
index 67f1980..5a80f89 100644
--- a/as_del_list
+++ b/as_del_list
@@ -35,6 +35,7 @@
 20480	21503	ripe
 23552	24575	apnic
 24576	25599	ripe
+27648	28671	lacnic
 
 ###
 ### DO NOT FORGET TO UPDATE whereas()
diff --git a/config.h b/config.h
index c25126a..3208c92 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.5.31"
+#define VERSION "4.5.32"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index 9822b81..66333db 100644
--- a/data.h
+++ b/data.h
@@ -35,6 +35,7 @@ const char *ripe_servers[] = {
 const char *ripe_servers_old[] = {
     "whois.ra.net",
     "whois.domain.kg",
+    "whois.nic.ch",
     NULL
 };
 
diff --git a/debian/changelog b/debian/changelog
index 782f1bd..3d2ef42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+whois (4.5.33) unstable; urgency=medium
+
+  * Added another RIPE IPv6 allocation.
+  * Fixed .net.au SLD.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 20 Nov 2002 03:50:49 +0100
+
+whois (4.5.32) unstable; urgency=medium
+
+  * Fixed .in TLD code.
+  * Updated .hk, ky, .nz TLDs.
+  * Added LACNIC ASN block.
+  * Added -uanic NIC handles.
+  * RPSL flags are not stripped anymore even if the server is unrecognized.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 16 Nov 2002 04:25:08 +0100
+
 whois (4.5.31) unstable; urgency=medium
 
   * Added undocumented -V command line option.
diff --git a/po/de.po b/po/de.po
index 965b3ae..cd9f664 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.13\n"
-"POT-Creation-Date: 2002-10-11 17:42+0200\n"
+"POT-Creation-Date: 2002-11-16 04:27+0100\n"
 "PO-Revision-Date: 2001-07-04 15:15+01:00\n"
 "Last-Translator: Simon Richter <Simon.Richter@in.tum.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:104
+#: ../whois.c:108
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,30 +24,30 @@ msgstr ""
 "\n"
 "Senden sie Bugreports an %s.\n"
 
-#: ../whois.c:147 ../whois.c:184
+#: ../whois.c:151 ../whois.c:188
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Benutze Server %s.\n"
 
-#: ../whois.c:161
+#: ../whois.c:165
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Benutze voreingestellten Server %s.\n"
 
-#: ../whois.c:164
+#: ../whois.c:168
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr "Diese TLD hat keinen whois-Server, aber eine whois-Datenbank unter"
 
-#: ../whois.c:170
+#: ../whois.c:174
 msgid "This TLD has no whois server."
 msgstr "Diese TLD hat keinen whois-Server."
 
-#: ../whois.c:174
+#: ../whois.c:178
 #, fuzzy
 msgid "Connecting to whois.crsnic.net."
 msgstr "Verbinde zu whois.internic.net."
 
-#: ../whois.c:180
+#: ../whois.c:184
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -58,7 +58,7 @@ msgstr ""
 "InterNIC verweist auf %s.\n"
 "\n"
 
-#: ../whois.c:193
+#: ../whois.c:197
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -67,12 +67,12 @@ msgstr ""
 "Suche nach: \"%s\"\n"
 "\n"
 
-#: ../whois.c:243 ../whois.c:246
+#: ../whois.c:247 ../whois.c:250
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:322
+#: ../whois.c:330
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -80,32 +80,33 @@ msgstr ""
 "Es lieί sich nicht feststellen, wer diese IP vergeben hat.\n"
 "Versuche ARIN..."
 
-#: ../whois.c:339
+#: ../whois.c:347
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr ""
 "Vermutlich ist dies ein Netblock-Name, aber es gibt keinen\n"
 "voreingestellten Server."
 
-#: ../whois.c:346
+#: ../whois.c:354
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr ""
 "Vermutlich ist dies ein Domainname, aber es gibt keinen\n"
 "voreingestellten Server."
 
-#: ../whois.c:356
+#: ../whois.c:364
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Unbekannte AS-Nummer. Bitte upgraden Sie dieses Programm."
 
-#: ../whois.c:386
-msgid "Warning: RIPE flags ignored for a traditional server."
+#: ../whois.c:399
+#, fuzzy
+msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Warnung: RIPE-Flags wurden ignoriert (\"traditioneller\" Server)."
 
-#: ../whois.c:448
+#: ../whois.c:457
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Verweis auf %s gefunden bei %s.\n"
 
-#: ../whois.c:465
+#: ../whois.c:474
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -113,22 +114,22 @@ msgstr ""
 "Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
 "Bitte upgraden sie dieses Programm.\n"
 
-#: ../whois.c:539
+#: ../whois.c:548
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s nicht gefunden."
 
-#: ../whois.c:549
+#: ../whois.c:558
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: unbekannter Dienst"
 
-#: ../whois.c:566
+#: ../whois.c:575
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Erhielt Signal %d, unterbrochen..."
 
-#: ../whois.c:611
+#: ../whois.c:620
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -154,7 +155,7 @@ msgid ""
 "-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]   query specified server info [RPSL only]\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"
diff --git a/po/el.po b/po/el.po
index b228f3c..677453c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.3\n"
-"POT-Creation-Date: 2002-10-11 17:42+0200\n"
+"POT-Creation-Date: 2002-11-16 04:27+0100\n"
 "PO-Revision-Date: 2001-02-23 16:07:57+0900\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:104
+#: ../whois.c:108
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,32 +24,32 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../whois.c:147 ../whois.c:184
+#: ../whois.c:151 ../whois.c:188
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
 
-#: ../whois.c:161
+#: ../whois.c:165
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Χρήση εξ' ορισμού εξυπηρετητή %s.\n"
 
-#: ../whois.c:164
+#: ../whois.c:168
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
 "βάση whois στο"
 
-#: ../whois.c:170
+#: ../whois.c:174
 msgid "This TLD has no whois server."
 msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
 
-#: ../whois.c:174
+#: ../whois.c:178
 #, fuzzy
 msgid "Connecting to whois.crsnic.net."
 msgstr "Γίνεται σύνδεση στο whois.internic.net."
 
-#: ../whois.c:180
+#: ../whois.c:184
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -60,7 +60,7 @@ msgstr ""
 "Βρέθηκε αναφορά από το InterNIC στο %s.\n"
 "\n"
 
-#: ../whois.c:193
+#: ../whois.c:197
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -69,12 +69,12 @@ msgstr ""
 "Αλφαριθμητικό ερώτησης: \"%s\"\n"
 "\n"
 
-#: ../whois.c:243 ../whois.c:246
+#: ../whois.c:247 ../whois.c:250
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:322
+#: ../whois.c:330
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -82,30 +82,31 @@ msgstr ""
 "Δε γνωρίζε σε ποιον έχει αποδοθεί ευθύνη για αυτήν την διεύθυνση IP.\n"
 "Θα δοκιμάσω το ARIN και εύχομε για το καλύτερο..."
 
-#: ../whois.c:339
+#: ../whois.c:347
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr ""
 "Πιστεύω ότι είναι όνομα μπλοκ δικτύου αλλά δε γνωρίζω που να το αναζητήσω."
 
-#: ../whois.c:346
+#: ../whois.c:354
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "Πιστεύω ότι είναι ένα επίθημα αλλά δε γνωρίζω που να το αναζητήσω."
 
-#: ../whois.c:356
+#: ../whois.c:364
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "¶γνωστος αριθμός AS. Παρακαλώ ενημερώστε αυτό το πρόγραμμα."
 
-#: ../whois.c:386
-msgid "Warning: RIPE flags ignored for a traditional server."
+#: ../whois.c:399
+#, fuzzy
+msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Προειδοποίηση: Η σημαίες του RIPE αγνοούνται σε έναν παραδοσιακό εξυπηρετητή."
 
-#: ../whois.c:448
+#: ../whois.c:457
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Ανιχνεύθηκε αναφορά του %s στο %s.\n"
 
-#: ../whois.c:465
+#: ../whois.c:474
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -113,22 +114,22 @@ msgstr ""
 "Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
 "Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
 
-#: ../whois.c:539
+#: ../whois.c:548
 #, c-format
 msgid "Host %s not found."
 msgstr "Το σύστημα %s δε βρέθηκε."
 
-#: ../whois.c:549
+#: ../whois.c:558
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: άγνωστη υπηρεσία"
 
-#: ../whois.c:566
+#: ../whois.c:575
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Διακοπή από το σήμα %d..."
 
-#: ../whois.c:611
+#: ../whois.c:620
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -154,7 +155,7 @@ msgid ""
 "-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]   query specified server info [RPSL only]\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"
diff --git a/po/es.po b/po/es.po
index 495077c..426d853 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.29\n"
-"POT-Creation-Date: 2002-10-11 17:42+0200\n"
+"POT-Creation-Date: 2002-11-16 04:27+0100\n"
 "PO-Revision-Date: 2002-08-24 16:22+0200\n"
 "Last-Translator: Francisco Monteagudo <francisco@monteagudo.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:104
+#: ../whois.c:108
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,31 +24,31 @@ msgstr ""
 "\n"
 "Informar de bugs a %s.\n"
 
-#: ../whois.c:147 ../whois.c:184
+#: ../whois.c:151 ../whois.c:188
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Usando el servidor %s.\n"
 
-#: ../whois.c:161
+#: ../whois.c:165
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Usando el servidor predefinido %s.\n"
 
-#: ../whois.c:164
+#: ../whois.c:168
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Este TLD no dispone de servidor whois, pero puede acceder a la informacion "
 "de whois en"
 
-#: ../whois.c:170
+#: ../whois.c:174
 msgid "This TLD has no whois server."
 msgstr "No existe servidor whois para este TLD."
 
-#: ../whois.c:174
+#: ../whois.c:178
 msgid "Connecting to whois.crsnic.net."
 msgstr "Conectando a whois.crsnic.net."
 
-#: ../whois.c:180
+#: ../whois.c:184
 #, c-format
 msgid ""
 "\n"
@@ -59,7 +59,7 @@ msgstr ""
 "Se ha encontrado en crsnic una referencia a %s.\n"
 "\n"
 
-#: ../whois.c:193
+#: ../whois.c:197
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -68,12 +68,12 @@ msgstr ""
 "Consulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:243 ../whois.c:246
+#: ../whois.c:247 ../whois.c:250
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "No puedo procesar esta linea: %s"
 
-#: ../whois.c:322
+#: ../whois.c:330
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -81,30 +81,31 @@ msgstr ""
 "Ignoro a quien a sido delegada esta direccion IP.\n"
 "Voy a probar con ARIN a ver si hay suerte..."
 
-#: ../whois.c:339
+#: ../whois.c:347
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr ""
 "Aparentemente, es el nombre de un netblock, pero ignoro donde buscarlo."
 
-#: ../whois.c:346
+#: ../whois.c:354
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "Aparentemente, es un nombre de dominio, pero ignoro donde buscarlo."
 
-#: ../whois.c:356
+#: ../whois.c:364
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Numero AS desconocido. Por favor, actualice este programa."
 
-#: ../whois.c:386
-msgid "Warning: RIPE flags ignored for a traditional server."
+#: ../whois.c:399
+#, fuzzy
+msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
 
-#: ../whois.c:448
+#: ../whois.c:457
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Detectada una referencia a %s en %s.\n"
 
-#: ../whois.c:465
+#: ../whois.c:474
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,22 +113,22 @@ msgstr ""
 "Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
 "Actualize este programa.\n"
 
-#: ../whois.c:539
+#: ../whois.c:548
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s no encontrado."
 
-#: ../whois.c:549
+#: ../whois.c:558
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servicio desconocido"
 
-#: ../whois.c:566
+#: ../whois.c:575
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrumpido por la seρal %d..."
 
-#: ../whois.c:611
+#: ../whois.c:620
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -153,7 +154,7 @@ msgid ""
 "-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]   query specified server info [RPSL only]\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"
diff --git a/po/it.po b/po/it.po
index 05c87f5..92f346e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.13\n"
-"POT-Creation-Date: 2002-10-11 17:42+0200\n"
+"POT-Creation-Date: 2002-11-16 04:27+0100\n"
 "PO-Revision-Date: 2002-04-26 04:09+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:104
+#: ../whois.c:108
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,30 +24,30 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../whois.c:147 ../whois.c:184
+#: ../whois.c:151 ../whois.c:188
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Uso il server %s.\n"
 
-#: ../whois.c:161
+#: ../whois.c:165
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Uso il server predefinito %s.\n"
 
-#: ../whois.c:164
+#: ../whois.c:168
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Questo TLD non ha un server whois, ma si puς accedere al database tramite"
 
-#: ../whois.c:170
+#: ../whois.c:174
 msgid "This TLD has no whois server."
 msgstr "Per questo TLD non esiste un server whois."
 
-#: ../whois.c:174
+#: ../whois.c:178
 msgid "Connecting to whois.crsnic.net."
 msgstr "Mi sto connettendo a whois.crsnic.net."
 
-#: ../whois.c:180
+#: ../whois.c:184
 #, c-format
 msgid ""
 "\n"
@@ -58,7 +58,7 @@ msgstr ""
 "Trovato un riferimento di CRSNIC a %s.\n"
 "\n"
 
-#: ../whois.c:193
+#: ../whois.c:197
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -67,12 +67,12 @@ msgstr ""
 "Richiesta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:243 ../whois.c:246
+#: ../whois.c:247 ../whois.c:250
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossibile interpretare questa riga: %s"
 
-#: ../whois.c:322
+#: ../whois.c:330
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -80,28 +80,28 @@ msgstr ""
 "Non so a chi θ stato delegato questo IP.\n"
 "Proverς con ARIN sperando per il meglio..."
 
-#: ../whois.c:339
+#: ../whois.c:347
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr "Credo che sia il nome di un netblock ma non so dove cercarlo."
 
-#: ../whois.c:346
+#: ../whois.c:354
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "Credo che sia un dominio ma non so dove cercarlo."
 
-#: ../whois.c:356
+#: ../whois.c:364
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Numero dell'AS sconosciuto. Per favore aggiorna il programma."
 
-#: ../whois.c:386
-msgid "Warning: RIPE flags ignored for a traditional server."
-msgstr "Attenzione: i flag RIPE sono ignorati dai server tradizionali."
+#: ../whois.c:399
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
 
-#: ../whois.c:448
+#: ../whois.c:457
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Trovato un riferimento a %s su %s.\n"
 
-#: ../whois.c:465
+#: ../whois.c:474
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -109,22 +109,22 @@ msgstr ""
 "Errore catastrofico: il testo di avvertenze θ cambiato.\n"
 "Aggiorna questo programma.\n"
 
-#: ../whois.c:539
+#: ../whois.c:548
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s non trovato."
 
-#: ../whois.c:549
+#: ../whois.c:558
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servizio sconosciuto"
 
-#: ../whois.c:566
+#: ../whois.c:575
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrotto dal segnale %d..."
 
-#: ../whois.c:611
+#: ../whois.c:620
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
@@ -149,7 +149,7 @@ msgid ""
 "-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]   query specified server info [RPSL only]\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"
@@ -182,7 +182,8 @@ msgstr ""
 "-t TIPO        chiede il template per un oggetto del TIPO ('all' per una "
 "lista)\n"
 "-v TIPO            chiede il template prolisso per un oggetto del TIPO\n"
-"-q [version|sources]  chiede al server le informazioni indicate [solo RPSL]\n"
+"-q [version|sources|types]  chiede al server le informazioni indicate "
+"[RPSL]\n"
 "-F                 output grezzo veloce (implica -r)\n"
 "-h HOST            si connette al server HOST\n"
 "-p PORTA           si connette alla PORTA\n"
diff --git a/po/no.po b/po/no.po
index b3da01d..c61ca28 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.5\n"
-"POT-Creation-Date: 2002-10-11 17:42+0200\n"
+"POT-Creation-Date: 2002-11-16 04:27+0100\n"
 "PO-Revision-Date: 1999-12-18 14:00:00\n"
 "Last-Translator: Egil Kvaleberg <egil@kvaleberg.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:104
+#: ../whois.c:108
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -22,30 +22,30 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:147 ../whois.c:184
+#: ../whois.c:151 ../whois.c:188
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Bruker tjener %s.\n"
 
-#: ../whois.c:161
+#: ../whois.c:165
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Bruker standardtjener %s.\n"
 
-#: ../whois.c:164
+#: ../whois.c:168
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:170
+#: ../whois.c:174
 msgid "This TLD has no whois server."
 msgstr ""
 
-#: ../whois.c:174
+#: ../whois.c:178
 #, fuzzy
 msgid "Connecting to whois.crsnic.net."
 msgstr "Kobler opp mot whois.internic.net."
 
-#: ../whois.c:180
+#: ../whois.c:184
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -56,7 +56,7 @@ msgstr ""
 "Fant InterNIC-referanse til %s.\n"
 "\n"
 
-#: ../whois.c:193
+#: ../whois.c:197
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -65,12 +65,12 @@ msgstr ""
 "Forespψrsel: \"%s\"\n"
 "\n"
 
-#: ../whois.c:243 ../whois.c:246
+#: ../whois.c:247 ../whois.c:250
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:322
+#: ../whois.c:330
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -78,28 +78,29 @@ msgstr ""
 "Vet ikke hvor denne IP-adressen har blitt delegert.\n"
 "Prψver ARIN og hεper det beste..."
 
-#: ../whois.c:339
+#: ../whois.c:347
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr "Gjetter at det er et netblock-navn, men vet ikke hvor det finnes."
 
-#: ../whois.c:346
+#: ../whois.c:354
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "Gjetter at det er er domene, men vet ikke hvor det finnes."
 
-#: ../whois.c:356
+#: ../whois.c:364
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
 
-#: ../whois.c:386
-msgid "Warning: RIPE flags ignored for a traditional server."
+#: ../whois.c:399
+#, fuzzy
+msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
 
-#: ../whois.c:448
+#: ../whois.c:457
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Referanse til %s vedrψrende %s.\n"
 
-#: ../whois.c:465
+#: ../whois.c:474
 #, fuzzy
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
@@ -108,22 +109,22 @@ msgstr ""
 "Alvorlig feil: INTERNIC har endret standardtekst.\n"
 "Vennligst oppdater programmet.\n"
 
-#: ../whois.c:539
+#: ../whois.c:548
 #, c-format
 msgid "Host %s not found."
 msgstr "Finner ikke verten %s."
 
-#: ../whois.c:549
+#: ../whois.c:558
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: ukjent port"
 
-#: ../whois.c:566
+#: ../whois.c:575
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Avbrudt av signal %d..."
 
-#: ../whois.c:611
+#: ../whois.c:620
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -149,7 +150,7 @@ msgid ""
 "-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]   query specified server info [RPSL only]\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"
diff --git a/po/pl.po b/po/pl.po
index 53edf83..97c7507 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.5\n"
-"POT-Creation-Date: 2002-10-11 17:42+0200\n"
+"POT-Creation-Date: 2002-11-16 04:27+0100\n"
 "PO-Revision-Date: 1999-12-18 14:00:00\n"
 "Last-Translator: Micha³ 'CeFeK' Nazarewicz <cefek@career.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:104
+#: ../whois.c:108
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -22,31 +22,31 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:147 ../whois.c:184
+#: ../whois.c:151 ../whois.c:188
 #, c-format
 msgid "Using server %s.\n"
 msgstr "UΏywam serwera %s.\n"
 
-#: ../whois.c:161
+#: ../whois.c:165
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Uzywam domy¶lnego serwera %s.\n"
 
-#: ../whois.c:164
+#: ../whois.c:168
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:170
+#: ../whois.c:174
 #, fuzzy
 msgid "This TLD has no whois server."
 msgstr "Nie ma serwera whois dla tej domeny."
 
-#: ../whois.c:174
+#: ../whois.c:178
 #, fuzzy
 msgid "Connecting to whois.crsnic.net."
 msgstr "£±czenie z hostem whois.internic.net."
 
-#: ../whois.c:180
+#: ../whois.c:184
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -57,7 +57,7 @@ msgstr ""
 "Znaleziono odniesienie z InterNIC do %s.\n"
 "\n"
 
-#: ../whois.c:193
+#: ../whois.c:197
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -66,12 +66,12 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:243 ../whois.c:246
+#: ../whois.c:247 ../whois.c:250
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:322
+#: ../whois.c:330
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -79,28 +79,29 @@ msgstr ""
 "Nie moΏna ustaliζ, do kogo ten adres IP zosta³ oddelegowany.\n"
 "Sprσbujκ ARIN i mam nadziejκ, Ώe siκ uda..."
 
-#: ../whois.c:339
+#: ../whois.c:347
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr "To nazwa bloku sieciowego, ale nie wiem, pod jak± nazw± szukaζ."
 
-#: ../whois.c:346
+#: ../whois.c:354
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "To nazwa domeny, ale nie wiem, gdzie jej szukaζ."
 
-#: ../whois.c:356
+#: ../whois.c:364
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Nieznany numer AS. Zainstaluj nowsz± wersjκ programu."
 
-#: ../whois.c:386
-msgid "Warning: RIPE flags ignored for a traditional server."
+#: ../whois.c:399
+#, fuzzy
+msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Uwaga: flagi RIPE s± ignorowane dla starszych serwerσw."
 
-#: ../whois.c:448
+#: ../whois.c:457
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Wykryto odniesienie do %s na %s.\n"
 
-#: ../whois.c:465
+#: ../whois.c:474
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -108,22 +109,22 @@ msgstr ""
 "Katastrofa! Tekst disclaimera zosta³ zmieniony.\n"
 "¦ci±gnij nowsz± wersjκ programu.\n"
 
-#: ../whois.c:539
+#: ../whois.c:548
 #, c-format
 msgid "Host %s not found."
 msgstr "Serwer %s nie zosta³ znaleziony."
 
-#: ../whois.c:549
+#: ../whois.c:558
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: us³uga nieznana"
 
-#: ../whois.c:566
+#: ../whois.c:575
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Przerwanie na sygna³ %d..."
 
-#: ../whois.c:611
+#: ../whois.c:620
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -149,7 +150,7 @@ msgid ""
 "-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]   query specified server info [RPSL only]\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"
diff --git a/tld_serv_list b/tld_serv_list
index 4b9a25d..a4cdbe8 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -49,8 +49,12 @@
 .ar	WEB http://www.nic.ar/consultas/consdom.htm
 .as	whois.nic.as
 .at	whois.aco.net
-.net.au	whois.connect.com.au
-.au	whois.aunic.net
+.asn.au	whois.ausregistry.net.au
+.com.au	whois.ausregistry.net.au
+.id.au	whois.ausregistry.net.au
+.net.au	whois.ausregistry.net.au
+.org.au	whois.ausregistry.net.au
+.au	whois.aunic.net	# edu gov
 #.aw			# NIC? www.setarnet.aw
 .az	NONE		# www.nic.az
 .ba	NONE		# http://www.utic.net.ba/domen/
@@ -67,7 +71,7 @@
 .bo	NONE		# www.nic.bo
 .br	whois.nic.br
 .bs	WEB http://www.nic.bs/cgi-bin/search.pl
-.bt	whois.nic.tm
+.bt	NONE
 .bv	NONE		# http://www.uninett.no/navn/bv-sj.html
 #.bw			# NIC? www.botsnet.bw btc.bw
 .by	WEB http://www.tld.by/indexeng.html
@@ -99,7 +103,7 @@
 .dm	NONE		# www.domains.dm ?
 .do	WEB http://www.nic.do
 .dz	NONE
-.ec	WEB http://www.nic.ec
+.ec	WEB http://www.nic.ec/consulta/whois.asp
 .ee	whois.eenet.ee
 .eg	NONE		# http://www.ise.org.eg/domain.htm
 #.eh
@@ -132,7 +136,7 @@
 .gu	WEB http://gadao.gov.gu/Scripts/wwsquery/wwsquery.dll?hois=guamquery
 #.gw			# no NIC?
 #.gy			# NIC? (UPR)
-.hk	WEB http://web.hkdnr.net.hk/hkdnr/
+.hk	whois.hkdnr.net.hk
 .hm	whois.registry.hm
 .hn	NONE		# www.nic.hn
 .hr	WEB http://www.dns.hr/pretrazivanje.html
@@ -142,8 +146,7 @@
 .ie	whois.domainregistry.ie
 .il	whois.isoc.org.il
 .im	WEB http://www.nic.im/exist.html
-#broken	.in	whois.ncst.ernet.in
-.in	WEB http://domain.ncst.ernet.in/search.php
+.in	whois.ncst.ernet.in
 .io	WEB http://www.io.io/whois.html
 #.iq			# NIC?
 .ir	whois.nic.ir
@@ -162,7 +165,7 @@
 #.kp
 .kr	whois.krnic.net
 .kw	WEB http://www.domainname.net.kw
-.ky	NONE		# www.nic.ky
+.ky	WEB http://146.115.157.215/whoisfrontend.asp
 .kz	whois.domain.kz
 .la	whois.nic.la
 .lb	WEB http://www.aub.edu.lb/lbdr/search.html
@@ -170,7 +173,7 @@
 .li	whois.nic.li
 .lk	whois.nic.lk
 .lr	NONE		# http://www.psg.com/dns/lr/
-.ls	NONE
+.ls	NONE		# NIC?
 .lt	whois.ripe.net
 .lu	whois.restena.lu
 .lv	whois.ripe.net
@@ -207,7 +210,7 @@
 .np	WEB http://www.mos.com.np/domsearch.html
 #.nr			# NIC? www.cenpan.net.nr
 .nu	whois.nic.nu
-.nz	whois.domainz.net.nz
+.nz	whois.srs.net.nz
 #.om	NONE		# NIC? http://www.gto.net.om
 .pa	WEB http://www.nic.pa
 .pe	whois.nic.pe
@@ -255,7 +258,7 @@
 .th	whois.thnic.net
 .tj	whois.nic.tj
 .tk	whois.dot.tk
-.tm	whois.nic.tm
+.tm	NONE
 .tn	NONE		# http://www.ati.tn/Nic/
 .to	whois.tonic.to
 .tp	NONE		# www.nic.tp
@@ -326,3 +329,4 @@
 -lrms	whois.afilias.net
 -tw	whois.twnic.net
 -nicir	whois.nic.ir
+-uanic	whois.com.ua
diff --git a/whois.1 b/whois.1
index 7dabff7..5b65381 100644
--- a/whois.1
+++ b/whois.1
@@ -41,9 +41,12 @@ Do not display the legal disclaimers some registries like to show you.
 .B \-p PORT
 Connect to PORT.
 .TP 8
-.B \-V
+.B \--verbose
 Be verbose.
 .TP 8
+.B \--help
+Display online help.
+.TP 8
 Other options are flags understood by RIPE-like servers.
 .SH NOTES
 Please remember that \fIwhois.networksolutions.com\fP by default will
@@ -54,13 +57,10 @@ NIC handles or people names you have to prepend the appropriate keyword
 If the \fI!\fP character is prepended to a NIC handle, the default
 server becomes \fIwhois.networksolutions.com\fP.
 .P
-When querying \fIwhois.arin.net\fP for AS numbers, the program will
+When querying \fIwhois.nic.mil\fP for AS numbers, the program will
 automatically convert the request in the appropriate format, inserting
 a space after the string "AS".
 .P
-When querying \fIwhois.ncst.ernet.in\fP for a string without spaces, the
-\fIdomain\fP keyword is prepended.
-.P
 When querying \fIwhois.corenic.net\fP, machine readable output is requested.
 .P
 RIPE-specific options are ignored when querying non-RIPE servers.
@@ -80,9 +80,9 @@ the \fI-H\fP flag is not used.
 .SH "SEE ALSO"
 \fIRFC 812\fP: NICNAME/WHOIS
 .PP
-\fIRIPE-157\fP, \fIRIPE-189\fP: RIPE NCC Database Documentation
+\fIRIPE-223\fP: RIPE NCC Database Documentation
 .PP
-Detailed help on available flags can be found in \fIRIPE-157\fP or in
+Detailed help on available flags can be found in \fIRIPE-223\fP or in
 the help file which can be obtained with the command:
 .IP
 .B whois -h whois.ripe.net HELP
diff --git a/whois.c b/whois.c
index 5bba294..61fbf16 100644
--- a/whois.c
+++ b/whois.c
@@ -284,14 +284,20 @@ const char *whichwhois(const char *s)
 
     /* IPv6 address */
     if (strchr(s, ':')) {
-	if (strncasecmp(s, "2001:2", 6) == 0 ||	/* XXX ugly hack! */
-	    strncasecmp(s, "2001:02", 6) == 0)
+	if (strncmp(s, "2001:2", 6) == 0 ||	/* XXX ugly hack! */
+	    strncmp(s, "2001:02", 6) == 0 ||
+	    strncasecmp(s, "2001:A",  6) == 0 ||
+	    strncasecmp(s, "2001:0A", 6) == 0 ||
+	    strncasecmp(s, "2001:C",  6) == 0 ||
+	    strncasecmp(s, "2001:0C", 6) == 0)
 	    return "whois.apnic.net";
-	if (strncasecmp(s, "2001:4", 6) == 0 ||
-	    strncasecmp(s, "2001:04", 6) == 0)
+	if (strncmp(s, "2001:4", 6) == 0 ||
+	    strncmp(s, "2001:04", 6) == 0)
 	    return "whois.arin.net";
-	if (strncasecmp(s, "2001:6", 6) == 0 ||
-	    strncasecmp(s, "2001:06", 6) == 0)
+	if (strncmp(s, "2001:6", 6) == 0 ||
+	    strncmp(s, "2001:06", 6) == 0 ||
+	    strncmp(s, "2001:8", 6) == 0 ||
+	    strncmp(s, "2001:08", 6) == 0)
 	    return "whois.ripe.net";
 	/* if (strncasecmp(s, "3ffe", 4) == 0) */
 	    return "whois.6bone.net";
@@ -356,7 +362,7 @@ const char *whereas(int asn, struct as_del aslist[])
 {
     int i;
 
-    if (asn > 27647)
+    if (asn > 28671)
 	puts(_("Unknown AS number. Please upgrade this program."));
     else for (i = 0; aslist[i].serv; i++)
 	if (asn >= aslist[i].first && asn <= aslist[i].last)
@@ -392,9 +398,8 @@ char *queryformat(const char *server, const char *flags, const char *query)
 	    }
     if (*flags) {
 	if (!isripe && strcmp(server, "whois.corenic.net") != 0)
-	    puts(_("Warning: RIPE flags ignored for a traditional server."));
-	else
-	    strcat(buf, flags);
+	    puts(_("Warning: RIPE flags used with a traditional server."));
+	strcat(buf, flags);
     }
     if (!isripe && strcmp(server, "whois.nic.mil") == 0 &&
 	    strncasecmp(query, "AS", 2) == 0 &&
@@ -402,9 +407,6 @@ char *queryformat(const char *server, const char *flags, const char *query)
 	sprintf(buf, "AS %s", query + 2);	/* fix query for DDN */
     else if (!isripe && strcmp(server, "whois.corenic.net") == 0)
 	sprintf(buf, "--machine %s", query);	/* machine readable output */
-    else if (!isripe && strcmp(server, "whois.ncst.ernet.in") == 0 &&
-	     !strchr(query, ' '))
-	sprintf(buf, "domain %s", query);	/* ask for a domain */
     else if (!isripe && strcmp(server, "whois.nic.ad.jp") == 0) {
 	char *lang = getenv("LANG");	/* not a perfect check, but... */
 	if (!lang || (strncmp(lang, "ja", 2) != 0))
@@ -636,7 +638,7 @@ void usage(void)
 "-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]   query specified server info [RPSL only]\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"
diff --git a/whois.spec b/whois.spec
index 8ac6edc..5146bce 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.5.30
+Version: 4.5.32
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>