Imported Debian version 4.5.8v4.5.8

18 files changed, 531 insertions, 133 deletions

diff --git a/as_del_list b/as_del_list
index 97a232e..2d81bb3 100644
--- a/as_del_list
+++ b/as_del_list
@@ -1,3 +1,4 @@
+379	508	whois.nic.mil
 1877	1901	ripe
 2043	2043	ripe
 2047	2047	ripe
diff --git a/config.h b/config.h
index f27a597..db0f1f9 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.5.7"
+#define VERSION "4.5.8"
 
 /* Configurable features */
 
@@ -22,6 +22,12 @@
 # endif
 #endif
 
+/* needs unistd.h */
+#ifdef _ISO_CPP_14882_1998
+/* Solaris 8 and better. What else? */
+# define HAVE_GETADDRINFO
+#endif
+
 /* system features */
 #ifdef ENABLE_NLS
 # ifndef NLS_CAT_NAME
diff --git a/data.h b/data.h
index c68819f..c4f6d86 100644
--- a/data.h
+++ b/data.h
@@ -10,6 +10,7 @@ const char *ripe_servers[] = {
     "whois.ripe.net",
     "whois.apnic.net",
     "whois.oleane.net",
+    "whois.denic.de",
     "rr.arin.net",		/* does not accept the old syntax */
     "whois.6bone.net",		/* 3.0.0b1 */
     "whois.aunic.net",
@@ -47,14 +48,6 @@ const char *rwhois_servers[] = {
 };
 #endif
 
-const char *gtlds[] = {
-    ".com",
-    ".net",
-    ".org",
-    ".edu",
-    NULL
-};
-
 const char *hide_strings[] = {
     "The Data in Network", "this query",
     "The data in Register", "By submitting",
diff --git a/debian/changelog b/debian/changelog
index 8797669..62f094e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+whois (4.5.8) unstable; urgency=low
+
+  * Use a bigger internal buffer to parse server output (Closes: #109919).
+  * Added german translation (Closes: #103480).
+  * Added support for domains like eu.org and uk.com.
+  * Fixed non-ASCII locales.
+  * Added another DDN AS block, .info and .biz servers.
+  * Updated .au netblocks data, .ng, .ua and .za TLD servers.
+  * When mkpasswd output is redirected to a file only the hashed password
+    is printed.
+  * Made some cosmetic changes for solaris.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 26 Aug 2001 16:46:23 +0200
+
 whois (4.5.7) unstable; urgency=low
 
   * Added -nicat and -il NIC handles (Closes: #94465).
diff --git a/ip_del_list b/ip_del_list
index 2206338..49915c6 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -8,6 +8,7 @@
 80.0.0.0/7	ripe
 0.0.0.0/2	arin	# all other A classes are managed by ARIN
 ## The B class space is a mess :-( - something could still be missing
+## I add here only netblocks split among customers in the RIPE DB.
 139.20.0.0/14	ripe
 139.24.0.0/14	ripe
 139.28.0.0/15	ripe
@@ -62,6 +63,9 @@
 200.20.0.0/16	whois.nic.br
 200.128.0.0/9	whois.nic.br
 200.0.0.0/7	arin
+# 203.0.0.0/10 has been moved from aunic to apnic, but the records in
+# the telstra database appears to be more detailed.
+# See http://www.apnic.net/db/aunic/ for details.
 203.27.128.0/18	telstra
 203.35.0.0/16	telstra
 203.36.0.0/14	telstra
@@ -72,7 +76,7 @@
 203.58.128.0/17	telstra
 203.58.32.0/19	telstra
 203.58.64.0/19	telstra
-203.0.0.0/10	aunic
+203.0.0.0/10	apnic
 202.11.0.0/16	whois.nic.ad.jp
 202.13.0.0/16	whois.nic.ad.jp
 202.15.0.0/16	whois.nic.ad.jp
diff --git a/make_tld_serv.pl b/make_tld_serv.pl
index d2735d6..0224084 100755
--- a/make_tld_serv.pl
+++ b/make_tld_serv.pl
@@ -11,7 +11,8 @@ while (<>) {
 		(my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/);
 	$b =~ s/^W(?:EB)?\s+/\\001/;
 	$b =~ s/^M(?:SG)?\s+/\\002/;
-	$b = "\\003" if ($b eq 'NONE');
+	$b = "\\004" if $b eq 'CRSNIC';
+	$b = "\\003" if $b eq 'NONE';
 	print "    \"$a\",\t\"$b\",\n";
 }
 
diff --git a/mkpasswd.1 b/mkpasswd.1
index 2d16ed7..706daa0 100644
--- a/mkpasswd.1
+++ b/mkpasswd.1
@@ -21,6 +21,8 @@ Compute the password using the \fITYPE\fP algorithm.
 .TP
 .B -s, --stdin
 Read the password from stdin instead of using \fIgetpass(3)\fP.
+If stdin is not connected to a tty then no other message than the hashed
+password is printed on stdout.
 .SH BUGS
 If the \fI--stdin\fP option is used, passwords containing some control
 characters may not be read correctly.
diff --git a/mkpasswd.c b/mkpasswd.c
index eec9fe9..a31b0bf 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -143,7 +143,8 @@ int main(int argc, char *argv[])
 
     if (!password) {
 	if (use_stdin) {
-	    fprintf(stderr, "Password: ");
+	    if (!isatty(STDIN_FILENO))
+		fprintf(stderr, "Password: ");
 	    password = malloc(128);
 	    if (!fgets(password, sizeof password, stdin)) {
 		perror("fgets:");
diff --git a/po/Makefile b/po/Makefile
index 157110c..2d186b1 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,7 +3,7 @@ INSTALLNLSDIR=$(BASEDIR)/usr/share/locale
 
 PACKAGE = whois
 
-CATALOGS = el.mo it.mo no.mo pl.mo
+CATALOGS = de.mo el.mo es.mo it.mo no.mo pl.mo
 
 POTFILES=../whois.c
 
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..faef4d7
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,187 @@
+# Abgeleitet von whois.pot.
+# Copyright (C) 2001 Simon Richter
+# Simon Richter <Simon.Richter@in.tum.de> 2001
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 4.4.13\n"
+"POT-Creation-Date: 2001-08-26 20:47+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:100
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Version %s.\n"
+"\n"
+"Senden sie Bugreports an %s.\n"
+
+#: ../whois.c:137
+msgid "Connecting to whois.internic.net."
+msgstr "Verbinde zu whois.internic.net."
+
+#: ../whois.c:143
+#, c-format
+msgid ""
+"\n"
+"Found InterNIC referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"InterNIC verweist auf %s.\n"
+"\n"
+
+#: ../whois.c:153
+#, c-format
+msgid "Using default server %s.\n"
+msgstr "Benutze voreingestellten Server %s.\n"
+
+#: ../whois.c:156
+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:162
+msgid "This TLD has no whois server."
+msgstr "Diese TLD hat keinen whois-Server."
+
+#: ../whois.c:166
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Benutze Server %s.\n"
+
+#: ../whois.c:175
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Suche nach: \"%s\"\n"
+"\n"
+
+#: ../whois.c:235
+msgid ""
+"I don't know where this IP has been delegated.\n"
+"I'll try ARIN and hope for the best..."
+msgstr ""
+"Es lieί sich nicht feststellen, wer diese IP vergeben hat.\n"
+"Versuche ARIN..."
+
+#: ../whois.c:252
+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:259
+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:269
+msgid "Unknown AS number. Please upgrade this program."
+msgstr "Unbekannte AS-Nummer. Bitte upgraden Sie dieses Programm."
+
+#: ../whois.c:299
+msgid "Warning: RIPE flags ignored for a traditional server."
+msgstr "Warnung: RIPE-Flags wurden ignoriert (\"traditioneller\" Server)."
+
+#: ../whois.c:363
+#, c-format
+msgid "Detected referral to %s on %s.\n"
+msgstr "Verweis auf %s gefunden bei %s.\n"
+
+#: ../whois.c:380
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
+"Bitte upgraden sie dieses Programm.\n"
+
+#: ../whois.c:450
+#, c-format
+msgid "Host %s not found."
+msgstr "Host %s nicht gefunden."
+
+#: ../whois.c:460
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: unbekannter Dienst"
+
+#: ../whois.c:477
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "Erhielt Signal %d, unterbrochen..."
+
+#: ../whois.c:520
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-a                     search all databases\n"
+"-F                     fast raw output (implies -r)\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+"-h HOST                connect to server HOST\n"
+"-H                     hide legal disclaimers\n"
+"-i ATTR[,ATTR]...      do an inverse lookup for specified ATTRibutes\n"
+"-x                     exact match [RPSL only]\n"
+"-l                     one level less specific lookup [RPSL only]\n"
+"-L                     find all Less specific matches\n"
+"-M                     find all More specific matches\n"
+"-m                     find first level more specific matches\n"
+"-r                     turn off recursive lookups\n"
+"-p PORT                connect to PORT\n"
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-S                     tell server to leave out syntactic sugar\n"
+"-s SOURCE[,SOURCE]...  search the database from SOURCE\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\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"
+"-d                     return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-K                     only primary keys are returned [RPSL only]\n"
+"-V    --verbose        explain what is being done\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+msgstr ""
+"Aufruf: whois [OPTION]... OBJEKT...\n"
+"\n"
+"-a                     alle Datenbanken durchsuchen\n"
+"-F                     \"schnelle\" Rohdatenausgabe (impliziert -r)\n"
+"-g QUELLE:BEGINN-ENDE  zeige Aenderungen auf QUELLE von BEGINN bis ENDE\n"
+"-h HOST                Verbinde zum Server HOST\n"
+"-H                     Haftungsausschluss nicht anzeigen\n"
+"-i ATTR[,ATTR]...      angegebene ATTRibute rόckauflφsen\n"
+"-x                     exakte Suche [nur RPSL]\n"
+"-l                     eine Ebene unspezifischere Suche [nur RPSL]\n"
+"-L                     suche unspezifischere Treffer\n"
+"-M                     suche spezifischere Treffer\n"
+"-m                     eine Ebene spezifischere Suche\n"
+"-r                     keine Rόckwδrtsauflφsung\n"
+"-p PORT                verbinde zu PORT\n"
+"-R                     zeige lokale Kopie des Domainobjekts, auch wenn es\n"
+"                       einen Verweis enthδlt\n"
+"-S                     erlaube dem Server, \"syntaktischen Zucker\" \n"
+"                       wegzulassen\n"
+"-s QUELLE[,QUELLE]...  suche in der Datenbank von QUELLE\n"
+"-T TYP[,TYP]...        suche nur nach Objekten vom Typ TYP\n"
+"-t TYP                 fordere Formular fόr Typ TYP an (\"all\" fόr eine \n"
+"                       Liste)-v TYP                 fordere ausfόhrliches "
+"Formular fόr Typ TYP an\n"
+"-q [version|quellen]   frage nach angegebener Server-Information [nur RPSL]\n"
+"-d                     zeige auch DNS-Rόckόbertragungsobjekte [nur RPSL]\n"
+"-K                     zeige nur Primδrschlόssel [nur RPSL]\n"
+"-V    --verbose        erklδre, was getan wird\n"
+"      --help           zeige diese Hilfe\n"
+"      --version        zeige Version\n"
diff --git a/po/el.po b/po/el.po
index 80e8e73..bf08ae6 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: 2001-02-24 11:41+0100\n"
+"POT-Creation-Date: 2001-08-26 20:47+0200\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:99
+#: ../whois.c:100
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,11 +24,11 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../whois.c:136
+#: ../whois.c:137
 msgid "Connecting to whois.internic.net."
 msgstr "Γίνεται σύνδεση στο whois.internic.net."
 
-#: ../whois.c:142
+#: ../whois.c:143
 #, c-format
 msgid ""
 "\n"
@@ -39,27 +39,27 @@ msgstr ""
 "Βρέθηκε αναφορά από το InterNIC στο %s.\n"
 "\n"
 
-#: ../whois.c:152
+#: ../whois.c:153
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Χρήση εξ' ορισμού εξυπηρετητή %s.\n"
 
-#: ../whois.c:155
+#: ../whois.c:156
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
 "βάση whois στο"
 
-#: ../whois.c:161
+#: ../whois.c:162
 msgid "This TLD has no whois server."
 msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
 
-#: ../whois.c:165
+#: ../whois.c:166
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
 
-#: ../whois.c:174
+#: ../whois.c:175
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -68,7 +68,7 @@ msgstr ""
 "Αλφαριθμητικό ερώτησης: \"%s\"\n"
 "\n"
 
-#: ../whois.c:234
+#: ../whois.c:235
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -76,30 +76,30 @@ msgstr ""
 "Δε γνωρίζε σε ποιον έχει αποδοθεί ευθύνη για αυτήν την διεύθυνση IP.\n"
 "Θα δοκιμάσω το ARIN και εύχομε για το καλύτερο..."
 
-#: ../whois.c:251
+#: ../whois.c:252
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr ""
 "Πιστεύω ότι είναι όνομα μπλοκ δικτύου αλλά δε γνωρίζω που να το αναζητήσω."
 
-#: ../whois.c:258
+#: ../whois.c:259
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "Πιστεύω ότι είναι ένα επίθημα αλλά δε γνωρίζω που να το αναζητήσω."
 
-#: ../whois.c:268
+#: ../whois.c:269
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "¶γνωστος αριθμός AS. Παρακαλώ ενημερώστε αυτό το πρόγραμμα."
 
-#: ../whois.c:298
+#: ../whois.c:299
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr ""
 "Προειδοποίηση: Η σημαίες του RIPE αγνοούνται σε έναν παραδοσιακό εξυπηρετητή."
 
-#: ../whois.c:362
+#: ../whois.c:363
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Ανιχνεύθηκε αναφορά του %s στο %s.\n"
 
-#: ../whois.c:379
+#: ../whois.c:380
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -159,32 +159,33 @@ msgstr ""
 "\n"
 "-a                     αναζήτηση σε όλες τις βάσεις δεδομένων\n"
 "-F                     γρήγορη ακατέργαστη έξοδος (υπονοεί -r)\n"
-"-g ΠΗΓΉ:ΠΡΏΤΟ:ΤΕΛΕΥΤΑΊΟ   πρώτα αναβαθμίζει από την ΠΗΓΉ από το σειριακό     "
-"                     ΠΡΏΤΟ ως ΤΕΛΕΥΤΑΊΟ\n"
+"-g ΠΗΓΉ:ΠΡΏΤΟ:ΤΕΛΕΥΤΑΊΟ   πρώτα αναβαθμίζει από την ΠΗΓΉ από το "
+"σειριακό                          ΠΡΏΤΟ ως ΤΕΛΕΥΤΑΊΟ\n"
 "-h ΣΎΣΤΗΜΑ             σύνδεση στον εξυπηρετητή ΣΎΣΤΗΜΑ\n"
 "-H                     απόκρυψη του νομικού εγγράφου αποποίησης ευθύνης\n"
-"-i ΧΑΡΑΚ[,ΧΑΡΑΚ]...    να γίνει μια αντίστροφη αναζήτηση για το καθορισμένα  "
-"                        ΧΑΡΑΚτηριστικά\n"
+"-i ΧΑΡΑΚ[,ΧΑΡΑΚ]...    να γίνει μια αντίστροφη αναζήτηση για το "
+"καθορισμένα                          ΧΑΡΑΚτηριστικά\n"
 "-x                     ακριβές ταίριασμα [μόνο RPSL]\n"
 "-l                     ένα επίπεδο λιγότερο συγκεκριμένη αναζήτηση [μόνο "
 "RPSL]\n"
 "-L                     εύρεση όλων των Λιγότερο συγκεκριμένων ταιριασμάτων\n"
-"-M                     εύρεση όλων των Περισσότερο συγκεκριμένων             "
-"             ταιριασμάτων\n"
-"-m                     εύρεση όλων των πρώτου επιπέδου περισσότερο           "
-"               συγκεκριμένων ταιριασμάτων\n"
+"-M                     εύρεση όλων των Περισσότερο "
+"συγκεκριμένων                          ταιριασμάτων\n"
+"-m                     εύρεση όλων των πρώτου επιπέδου "
+"περισσότερο                          συγκεκριμένων ταιριασμάτων\n"
 "-r                     απενεργοποίηση των αναδρομικών αναζητήσεων\n"
 "-p ΘΎΡΑ                σύνδεση στη ΘΎΡΑ\n"
-"-R                     επιβολή εμφάνισης τοπικού αντιγράφου του αντικειμένου "
-"                         επιθήματος ακόμα και αν περιέχει αναφορές\n"
-"-S                     πες στον εξυπηρετητή να αποφύγει τη συντακτική        "
-"                  ζάχαρη\n"
+"-R                     επιβολή εμφάνισης τοπικού αντιγράφου του "
+"αντικειμένου                          επιθήματος ακόμα και αν περιέχει "
+"αναφορές\n"
+"-S                     πες στον εξυπηρετητή να αποφύγει τη "
+"συντακτική                          ζάχαρη\n"
 "-s ΠΗΓΉ[,ΠΗΓΉ]...      αναζήτηση στη βάση από την ΠΗΓΉ\n"
 "-T ΕΊΔΟΣ[,ΕΊΔΟΣ]...    αναζήτηση μόνο αντικειμένου του ΕΊΔΟΥΣ\n"
-"-t ΕΊΔΟΣ               αναζητά ένα πρότυπο για το αντικείμενο του ΕΊΔΟΥΣ     "
-"                     ('all' για για εμφάνιση λίστας)\n"
-"-v ΕΊΔΟΣ               αναζητά περιφραστικό πρότυπο για το αντικείμενο του   "
-"                       ΕΊΔΟΥΣ\n"
+"-t ΕΊΔΟΣ               αναζητά ένα πρότυπο για το αντικείμενο του "
+"ΕΊΔΟΥΣ                          ('all' για για εμφάνιση λίστας)\n"
+"-v ΕΊΔΟΣ               αναζητά περιφραστικό πρότυπο για το αντικείμενο "
+"του                          ΕΊΔΟΥΣ\n"
 "-d                     επιστροφή και των αντιστρόφων αντικειμένων DNS\n"
 "                         απόδοσης ευθύνης [μόνο RPSL]\n"
 "-K                     επιστροφή μόνο των πρωταρχικών κλειδιών [μόνο RPSL]\n"
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..663ecbc
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,189 @@
+# Spanish translation for whois.pot.
+# Copyright (C) 2001 Francisco Monteagudo
+# Francisco Monteagudo <francisco@monteagudo.net>, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 4.5.7\n"
+"POT-Creation-Date: 2001-08-26 20:47+0200\n"
+"PO-Revision-Date: 2001-06-07 17:21+02:00\n"
+"Last-Translator: Francisco Monteagudo <francisco@monteagudo.net>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:100
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Version %s.\n"
+"\n"
+"Informar de bugs a %s.\n"
+
+#: ../whois.c:137
+msgid "Connecting to whois.internic.net."
+msgstr "Conectando a whois.internic.net."
+
+#: ../whois.c:143
+#, c-format
+msgid ""
+"\n"
+"Found InterNIC referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"Se ha encontrado en InterNIC una referencia a %s.\n"
+"\n"
+
+#: ../whois.c:153
+#, c-format
+msgid "Using default server %s.\n"
+msgstr "Usando el servidor predefinido %s.\n"
+
+#: ../whois.c:156
+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:162
+msgid "This TLD has no whois server."
+msgstr "No existe servidor whois para este TLD."
+
+#: ../whois.c:166
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Usando el servidor %s.\n"
+
+#: ../whois.c:175
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Consulta: \"%s\"\n"
+"\n"
+
+#: ../whois.c:235
+msgid ""
+"I don't know where this IP has been delegated.\n"
+"I'll try ARIN and hope for the best..."
+msgstr ""
+"Ignoro a quien a sido delegada esta direccion IP.\n"
+"Voy a probar con ARIN a ver si hay suerte..."
+
+#: ../whois.c:252
+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:259
+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:269
+msgid "Unknown AS number. Please upgrade this program."
+msgstr "Numero AS desconocido. Por favor, actualice este programa."
+
+#: ../whois.c:299
+msgid "Warning: RIPE flags ignored for a traditional server."
+msgstr ""
+"Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
+
+#: ../whois.c:363
+#, c-format
+msgid "Detected referral to %s on %s.\n"
+msgstr "Detectada una referencia a %s en %s.\n"
+
+#: ../whois.c:380
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
+"Actualize este programa.\n"
+
+#: ../whois.c:450
+#, c-format
+msgid "Host %s not found."
+msgstr "Host %s no encontrado."
+
+#: ../whois.c:460
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: servicio desconocido"
+
+#: ../whois.c:477
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "Interrumpido por la seρal %d..."
+
+#: ../whois.c:520
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-a                     search all databases\n"
+"-F                     fast raw output (implies -r)\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+"-h HOST                connect to server HOST\n"
+"-H                     hide legal disclaimers\n"
+"-i ATTR[,ATTR]...      do an inverse lookup for specified ATTRibutes\n"
+"-x                     exact match [RPSL only]\n"
+"-l                     one level less specific lookup [RPSL only]\n"
+"-L                     find all Less specific matches\n"
+"-M                     find all More specific matches\n"
+"-m                     find first level more specific matches\n"
+"-r                     turn off recursive lookups\n"
+"-p PORT                connect to PORT\n"
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-S                     tell server to leave out syntactic sugar\n"
+"-s SOURCE[,SOURCE]...  search the database from SOURCE\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\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"
+"-d                     return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-K                     only primary keys are returned [RPSL only]\n"
+"-V    --verbose        explain what is being done\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+msgstr ""
+"Uso: whois [OPCIONES]... OBJETO...\n"
+"\n"
+"-a                 busca en todas las bases de datos\n"
+"-F                 modo rapido (implica -r)\n"
+"-g SOURCE:FIRST-LAST  localiza las ocurrencias de SOURCE en la serie F a L\n"
+"-h HOST            se conecta al servidor HOST\n"
+"-H                 oculta el aviso legal\n"
+"-i ATTR[,ATTR]...  efectua una busqueda inversa para el ATTRibuto "
+"specificado\n"
+"-x                 busqueda exacta [solo RPSL]\n"
+"-l                 desciende en un nivel la especifidad de la busqueda "
+"[RPSL]\n"
+"-L                 busca las correspondencias menos especificas\n"
+"-M                 busca las correspondencias mas especificas\n"
+"-m                 busca el primer nivel mas especifico\n"
+"-r                 desactiva la busqueda recursiva\n"
+"-p PUERTO          conecta al PUERTO\n"
+"-R                 muestra la copia local del objeto especificado incluso\n"
+"                   si contiene una referencia\n"
+"-S                 indica al servidor que no use peculiarides sintacticas\n"
+"-s SOURCE[,SOURCE]...  busca la base de datos de SOURCE\n"
+"-T TIPO[,TIPO]...  busca unicamente objetos del tipo TIPO\n"
+"-t TIPO        obtiene la plantilla para un objeto de TIPO ('all' para una "
+"lista)\n"
+"-v TIPO            obtiene la plantilla detallada de un objeto TIPO\n"
+"-q [version|sources]  consulta informacion sobre el servidor [solo RPSL]\n"
+"-d                 devuelve tambien la delegacion inversa del DNS [solo "
+"RPSL]\n"
+"-K                 solo devuelve claves primarias [solo RPSL]\n"
+"-V    --verbose    muestra lo que se esta haciendo\n"
+"      --help       muestra esta pantalla de ayuda y finaliza\n"
+"      --version    muestra la version del programa y finaliza\n"
diff --git a/po/it.po b/po/it.po
index 7765d42..fa69391 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: 2001-02-24 11:41+0100\n"
+"POT-Creation-Date: 2001-08-26 20:47+0200\n"
 "PO-Revision-Date: 2001-02-24 11:43+01:00\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:99
+#: ../whois.c:100
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,11 +24,11 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../whois.c:136
+#: ../whois.c:137
 msgid "Connecting to whois.internic.net."
 msgstr "Mi sto connettendo a whois.internic.net."
 
-#: ../whois.c:142
+#: ../whois.c:143
 #, c-format
 msgid ""
 "\n"
@@ -39,26 +39,26 @@ msgstr ""
 "Trovato un riferimento di InterNIC a %s.\n"
 "\n"
 
-#: ../whois.c:152
+#: ../whois.c:153
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Uso il server predefinito %s.\n"
 
-#: ../whois.c:155
+#: ../whois.c:156
 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:161
+#: ../whois.c:162
 msgid "This TLD has no whois server."
 msgstr "Per questo TLD non esiste un server whois."
 
-#: ../whois.c:165
+#: ../whois.c:166
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Uso il server %s.\n"
 
-#: ../whois.c:174
+#: ../whois.c:175
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -67,7 +67,7 @@ msgstr ""
 "Richiesta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:234
+#: ../whois.c:235
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -75,28 +75,28 @@ msgstr ""
 "Non so a chi θ stato delegato questo IP.\n"
 "Proverς con ARIN sperando per il meglio..."
 
-#: ../whois.c:251
+#: ../whois.c:252
 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:258
+#: ../whois.c:259
 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:268
+#: ../whois.c:269
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Numero dell'AS sconosciuto. Per favore aggiorna il programma."
 
-#: ../whois.c:298
+#: ../whois.c:299
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Attenzione: i flag RIPE sono ignorati dai server tradizionali."
 
-#: ../whois.c:362
+#: ../whois.c:363
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Trovato un riferimento a %s su %s.\n"
 
-#: ../whois.c:379
+#: ../whois.c:380
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
diff --git a/po/no.po b/po/no.po
index 6128f4a..8fa61db 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: 2001-02-24 11:41+0100\n"
+"POT-Creation-Date: 2001-08-26 20:47+0200\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:99
+#: ../whois.c:100
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -22,11 +22,11 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:136
+#: ../whois.c:137
 msgid "Connecting to whois.internic.net."
 msgstr "Kobler opp mot whois.internic.net."
 
-#: ../whois.c:142
+#: ../whois.c:143
 #, c-format
 msgid ""
 "\n"
@@ -37,25 +37,25 @@ msgstr ""
 "Fant InterNIC-referanse til %s.\n"
 "\n"
 
-#: ../whois.c:152
+#: ../whois.c:153
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Bruker standardtjener %s.\n"
 
-#: ../whois.c:155
+#: ../whois.c:156
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:161
+#: ../whois.c:162
 msgid "This TLD has no whois server."
 msgstr ""
 
-#: ../whois.c:165
+#: ../whois.c:166
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Bruker tjener %s.\n"
 
-#: ../whois.c:174
+#: ../whois.c:175
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -64,7 +64,7 @@ msgstr ""
 "Forespψrsel: \"%s\"\n"
 "\n"
 
-#: ../whois.c:234
+#: ../whois.c:235
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -72,28 +72,28 @@ msgstr ""
 "Vet ikke hvor denne IP-adressen har blitt delegert.\n"
 "Prψver ARIN og hεper det beste..."
 
-#: ../whois.c:251
+#: ../whois.c:252
 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:258
+#: ../whois.c:259
 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:268
+#: ../whois.c:269
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
 
-#: ../whois.c:298
+#: ../whois.c:299
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
 
-#: ../whois.c:362
+#: ../whois.c:363
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Referanse til %s vedrψrende %s.\n"
 
-#: ../whois.c:379
+#: ../whois.c:380
 #, fuzzy
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
diff --git a/po/pl.po b/po/pl.po
index ca101f4..638c4bd 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: 2001-02-24 11:41+0100\n"
+"POT-Creation-Date: 2001-08-26 20:47+0200\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:99
+#: ../whois.c:100
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -22,11 +22,11 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:136
+#: ../whois.c:137
 msgid "Connecting to whois.internic.net."
 msgstr "£±czenie z hostem whois.internic.net."
 
-#: ../whois.c:142
+#: ../whois.c:143
 #, c-format
 msgid ""
 "\n"
@@ -37,26 +37,26 @@ msgstr ""
 "Znaleziono odniesienie z InterNIC do %s.\n"
 "\n"
 
-#: ../whois.c:152
+#: ../whois.c:153
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Uzywam domy¶lnego serwera %s.\n"
 
-#: ../whois.c:155
+#: ../whois.c:156
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:161
+#: ../whois.c:162
 #, fuzzy
 msgid "This TLD has no whois server."
 msgstr "Nie ma serwera whois dla tej domeny."
 
-#: ../whois.c:165
+#: ../whois.c:166
 #, c-format
 msgid "Using server %s.\n"
 msgstr "UΏywam serwera %s.\n"
 
-#: ../whois.c:174
+#: ../whois.c:175
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -65,7 +65,7 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:234
+#: ../whois.c:235
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -73,28 +73,28 @@ msgstr ""
 "Nie moΏna ustaliζ, do kogo ten adres IP zosta³ oddelegowany.\n"
 "Sprσbujκ ARIN i mam nadziejκ, Ώe siκ uda..."
 
-#: ../whois.c:251
+#: ../whois.c:252
 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:258
+#: ../whois.c:259
 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:268
+#: ../whois.c:269
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Nieznany numer AS. Zainstaluj nowsz± wersjκ programu."
 
-#: ../whois.c:298
+#: ../whois.c:299
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Uwaga: flagi RIPE s± ignorowane dla starszych serwerσw."
 
-#: ../whois.c:362
+#: ../whois.c:363
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Wykryto odniesienie do %s na %s.\n"
 
-#: ../whois.c:379
+#: ../whois.c:380
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -165,8 +165,8 @@ msgstr ""
 "-S                     tell server to leave out syntactic sugar\n"
 "-s SOURCE[,SOURCE]...  przeszukuje baze danych ze ¬RΣD£A\n"
 "-T TYPE[,TYPE]...      szuka tylko obiektσw TYPE\n"
-"-t TYPE                requests template for object of TYPE ('all' for "
-"a\t\t\tlist)\n"
+"-t TYPE                requests template for object of TYPE ('all' for a\t\t"
+"\tlist)\n"
 "-v TYPE                requests verbose template for object of TYPE\n"
 "-V                     wyja¶nia, co siκ dzieje\n"
 "\n"
diff --git a/tld_serv_list b/tld_serv_list
index a0af57f..9c72066 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -20,9 +20,15 @@
 .uy.com	whois.centralnic.net
 .za.com	whois.centralnic.net
 .eu.org	whois.eu.org
+.com	CRSNIC
+.net	CRSNIC
+.org	CRSNIC
+.edu	CRSNIC
 .gov	whois.nic.gov
 .int	whois.isi.edu
 .mil	whois.nic.mil
+.info	whois.nic.info
+.biz	whois.biz.info
 .ac	whois.nic.ac
 .ad	NONE		# http://www.nic.ad
 .ae	WEB http://cc.emirates.net.ae/Customer_care/cc_card/check_domains.choose_domains/
@@ -189,7 +195,7 @@
 .nc	NONE		# http://www.orstom.nc/BASE/IRD_NOUMEA/TLD_NC/
 #.ne			# NIC? http://www.intnet.ne
 .nf	NONE		# http://www.names.nf
-.ng	pgebrehiwot.iat.cnr.it
+.ng	whois.rg.net
 .ni	WEB http://ns.ni/whois.htm
 .nl	whois.domain-registry.nl
 .no	whois.norid.no
@@ -253,14 +259,14 @@
 .tv	NONE		# http://internet.tv
 .tw	whois.twnic.net
 .tz	NONE		# http://www.psg.com/dns/tz/
-.ua	WEB http://nic.ua.net/botik.cgi
+.ua	whois.com.ua
 .ug	NONE		# http://www.nic.ug
 .gov.uk	whois.ja.net
 .ac.uk	whois.ja.net
 .uk	whois.nic.uk
 .um	whois.isi.edu	# not checked
 .fed.us	whois.nic.gov
-.us	whois.isi.edu
+.us	nii.isi.edu
 .com.uy	WEB http://dns.antel.net.uy/clientes/consultar.htm
 .uy	WEB http://www.rau.edu.uy/rau/dom/reg.htm
 #.uz			# www.noc.uz (broken)
@@ -276,7 +282,10 @@
 #.ye			# NIC? www.y.net.ye
 #.yt			# NIC-FR!
 .yu	NONE		# www.nic.yu
-.za	whois.frd.ac.za
+.ac.za	whois.frd.ac.za
+.co.za	WEB whois.co.za
+.edu.za	WEB edu.za
+.za	NONE
 .zm	NONE		# http://www.zamnet.zm/siteindex/Links/JoinZamnet.htm
 .zr	NONE		# obsoleted by cd
 #.zw			# NIC? zptc.co.zw http://www.zispa.co.zw/
diff --git a/whois.c b/whois.c
index 383f9e9..ab7d159 100644
--- a/whois.c
+++ b/whois.c
@@ -9,11 +9,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <unistd.h>
 #include "config.h"
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #endif
-#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
@@ -43,8 +43,12 @@ static struct option longopts[] = {
     {"verbose",	no_argument,		NULL, 'V'},
     {"server",	required_argument,	NULL, 'h'},
     {"host",	required_argument,	NULL, 'h'},
+    {"port",	required_argument,	NULL, 'p'},
     {NULL,	0,			NULL, 0  }
 };
+#else
+extern char *optarg;
+extern int optind;
 #endif
 
 int main(int argc, char *argv[])
@@ -52,11 +56,9 @@ int main(int argc, char *argv[])
     int ch, nopar = 0;
     const char *server = NULL, *port = NULL;
     char *p, *q, *qstring, fstring[64] = "\0";
-    extern char *optarg;
-    extern int optind;
 
 #ifdef ENABLE_NLS
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
     textdomain(NLS_CAT_NAME);
 #endif
@@ -131,17 +133,6 @@ int main(int argc, char *argv[])
 	}
     }
 
-    if (!server && domfind(qstring, gtlds)) {
-	if (verb)
-	    puts(_("Connecting to whois.internic.net."));
-	sockfd = openconn("whois.internic.net", NULL);
-	server = query_crsnic(sockfd, qstring);
-	closeconn(sockfd);
-	if (!server)
-	    exit(0);
-	printf(_("\nFound InterNIC referral to %s.\n\n"), server);
-    }
-
     if (!server) {
 	server = whichwhois(qstring);
 	switch (server[0]) {
@@ -160,6 +151,16 @@ int main(int argc, char *argv[])
 	    case 3:
 		puts(_("This TLD has no whois server."));
 		exit(0);
+	    case 4:
+		if (verb)
+		    puts(_("Connecting to whois.internic.net."));
+		sockfd = openconn("whois.internic.net", NULL);
+		server = query_crsnic(sockfd, qstring);
+		closeconn(sockfd);
+		if (!server)
+		    exit(0);
+		printf(_("\nFound InterNIC referral to %s.\n\n"), server);
+		break;
 	    default:
 		if (verb)
 		    printf(_("Using server %s.\n"), server);
@@ -323,18 +324,18 @@ char *queryformat(const char *server, const char *flags, const char *query)
 
 void do_query(const int sock, const char *query)
 {
-    char buf[200], *p;
+    char buf[2000], *p;
     FILE *fi;
     int i = 0, hide = hide_discl;
 
     fi = fdopen(sock, "r");
     if (write(sock, query, strlen(query)) < 0)
 	err_sys("write");
-/* It has been reported this call breaks the client in some situations. Why?
+/* Using shutdown breaks the buggy RIPE server.
     if (shutdown(sock, 1) < 0)
 	err_sys("shutdown");
 */
-    while (fgets(buf, 200, fi)) {	/* XXX errors? */
+    while (fgets(buf, sizeof(buf), fi)) {
 	if (hide == 1) {
 	    if (strncmp(buf, hide_strings[i+1], strlen(hide_strings[i+1]))==0)
 		hide = 2;	/* stop hiding */
@@ -382,7 +383,7 @@ void do_query(const int sock, const char *query)
 
 const char *query_crsnic(const int sock, const char *query)
 {
-    char *temp, buf[100], *ret = NULL;
+    char *temp, buf[2000], *ret = NULL;
     FILE *fi;
 
     temp = malloc(strlen(query) + 1 + 2 + 1);
@@ -393,7 +394,7 @@ const char *query_crsnic(const int sock, const char *query)
     fi = fdopen(sock, "r");
     if (write(sock, temp, strlen(temp)) < 0)
 	err_sys("write");
-    while (fgets(buf, 100, fi)) {
+    while (fgets(buf, sizeof(buf), fi)) {
 	/* If there are multiple matches only the server of the first record
 	   is queried */
 	if (strncmp(buf, "   Whois Server:", 16) == 0 && !ret) {
@@ -436,7 +437,7 @@ int openconn(const char *server, const char *port)
     for (ressave = res; res; res = res->ai_next) {
 	if ((fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol))<0)
 	    continue;		/* ignore */
-	if (connect(fd, res->ai_addr, res->ai_addrlen) == 0)
+	if (connect(fd, (struct sockaddr *)res->ai_addr, res->ai_addrlen) == 0)
 	    break;		/* success */
 	close(fd);
     }
@@ -459,7 +460,7 @@ int openconn(const char *server, const char *port)
 	    err_quit(_("%s/tcp: unknown service"), port);
 	saddr.sin_port = servinfo->s_port;
     }
-    if (connect(fd, &saddr, sizeof(saddr)) < 0)
+    if (connect(fd, (struct sockaddr *)&saddr, sizeof(saddr)) < 0)
 	err_sys("connect");
 #endif
     return (fd);
@@ -491,17 +492,6 @@ int domcmp(const char *dom, const char *tld)
     return 0;
 }
 
-/* check if dom ends with an element of tldlist[] */
-int domfind(const char *dom, const char *tldlist[])
-{
-    int i;
-
-    for (i = 0; tldlist[i]; i++)
-	if (domcmp(dom, tldlist[i]))
-	    return 1;
-    return 0;
-}
-
 unsigned long myinet_aton(const char *s)
 {
     int a, b, c, d;
diff --git a/whois.spec b/whois.spec
index 4060427..6aed1d9 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.5.3
+Version: 4.5.8
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>