Imported Debian version 4.5.25v4.5.25

16 files changed, 429 insertions, 287 deletions

diff --git a/README b/README
index 5411a8a..13f712d 100644
--- a/README
+++ b/README
@@ -18,7 +18,6 @@ The home of the program is http://www.linux.it/~md/software/
 Other information sources:
 - RIPE-187 and RIPE-189 (from ftp://ftp.ripe.net/ripe/docs/ or
   http://www.ripe.net/docs/)
-- Greg Woods' awhois script (from ftp.weird.com)
 - the www.geektools.org CGI proxy
 - home of the 6bone client: http://www.ip.qwest.net/~david/software/
 - http://www.apnic.net/db/RIRs.html and
@@ -26,6 +25,8 @@ Other information sources:
 - http://www.uninett.no/navn/domreg.html
 - http://www.iahc.org/dns-refs/registry.html
 - http://www.iana.org/root-whois/xx.htm
+- http://www.afrinic.org
+- http://www.aftld.org
 
 Marco d'Itri
 <md@linux.it>
diff --git a/as_del_list b/as_del_list
index c2593c3..bf94da5 100644
--- a/as_del_list
+++ b/as_del_list
@@ -25,6 +25,8 @@
 18432	19455	arin
 19456	20479	arin
 20480	21503	ripe
+23552	24575	apnic
+24576	25599	ripe
 
 ###
 ### DO NOT FORGET TO UPDATE whereas()
diff --git a/config.h b/config.h
index ac2a591..70d5dda 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.5.21"
+#define VERSION "4.5.24"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index 704e0d0..e08f22d 100644
--- a/data.h
+++ b/data.h
@@ -23,6 +23,7 @@ const char *ripe_servers[] = {
     "rr.level3.net",		/* 3.0.0a13 */
     "whois.arnes.si",
     "www.registry.co.ug",
+    "whois.nic.ir",
     NULL
 };
 
@@ -49,9 +50,9 @@ const char *rwhois_servers[] = {
 #endif
 
 const char *hide_strings[] = {
-    "The Data in Network", "this query",
+    "The Data in the VeriSign", "terms at any time.",
     "The data in Register", "By submitting",
-    "The data contained in Dotster", "to these terms of usage and",
+    " The data contained in Dotster", "Please limit your",
     "This whois service currently only", "top-level domains.",
     "Signature Domains' Whois Service", "agree to abide by the above",
     "Access to ASNIC", "by this policy.",
@@ -60,6 +61,8 @@ const char *hide_strings[] = {
     "NeuLevel, Inc., the Registry Operator", "whatsoever, you agree",
     "NOTICE: Access to .INFO WHOIS", "time. By submitting",
     "Disclaimer: The Global Name Registry", "for any commercial",
+    "Access to America Online", "time. By accessing",
+    "Access and use restricted", "http://www.icann", /* GANDI */
     NULL, NULL
 };
 
@@ -71,6 +74,7 @@ const char *nic_handles[] = {
     "coco-",	"whois.corenic.net",
     "coho-",	"whois.corenic.net",
     "core-",	"whois.corenic.net",
+    "denic-",	"whois.denic.de",
     /* RPSL objects */
     "as-",	"whois.ripe.net",
     "rs-",	"whois.ripe.net",
diff --git a/debian/changelog b/debian/changelog
index 1825458..22e1e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+whois (4.5.25) unstable; urgency=medium
+
+  * Updated data for -H option.
+  * Updated .tk and .hr TLD servers (Closes: #140517).
+  * Updated mkpasswd (added --password-fd).
+
+ -- Marco d'Itri <md@linux.it>  Fri,  5 Apr 2002 15:20:23 +0200
+
+whois (4.5.22) unstable; urgency=medium
+
+  * Added .bz, .gg, .ir, .je, .my TLD servers.
+  * Added -nicir and -denic NIC handles.
+  * Updated .hk TLD server.
+  * Updated ASN list.
+  * netsol-managed gTLD server changed to whois.crsnic.net (Closes: #132221).
+  * Updated hide_strings[] for netsol.
+  * Fixed bug which truncates password read from stdin (Closes: #137377).
+
+ -- Marco d'Itri <md@linux.it>  Fri,  8 Mar 2002 18:00:11 +0100
+
 whois (4.5.21) unstable; urgency=medium
 
   * Fixed stupid bug. (Closes: #132067).
diff --git a/mkpasswd.1 b/mkpasswd.1
index 706daa0..395cf6d 100644
--- a/mkpasswd.1
+++ b/mkpasswd.1
@@ -18,11 +18,16 @@ Use the \fISTRING\fP as salt.
 .TP
 .B -H, --hash=TYPE
 Compute the password using the \fITYPE\fP algorithm.
+If \fITYPE\fP is missing available algorithms are printed.
+.TP
+.B -P, --password-fd=NUM
+Read the password from file descriptor \fINUM\fP instead of using
+\fIgetpass(3)\fP.
+If the file descriptor is not connected to a tty then no other message
+than the hashed password is printed on stdout.
 .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.
+Like \fI--password-fd=0\fP.
 .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 f8c3af2..ecf6a01 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -1,5 +1,5 @@
 /*
- *    Copyright (C) 2001  Marco d'Itri
+ *    Copyright (C) 2001-2002  Marco d'Itri
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -31,13 +31,16 @@
 
 #ifdef HAVE_GETOPT_LONG
 static struct option longopts[] = {
+    {"hash",		optional_argument,	NULL, 'H'},
+    {"help",		no_argument,		NULL, 'h'},
     {"stdin",		no_argument,		NULL, 's'},
+    {"password-fd",	required_argument,	NULL, 'P'},
     {"salt",		required_argument,	NULL, 'S'},
-    {"hash",		required_argument,	NULL, 'H'},
-    {"help",		no_argument,		NULL, 'h'},
     {"version",		no_argument,		NULL, 'V'},
     {NULL,		0,			NULL, 0  }
 };
+#else
+#error xXXX
 #endif
 
 static char valid_salts[] = "abcdefghijklmnopqrstuvwxyz"
@@ -47,11 +50,15 @@ struct salt_prefix {
     const char *algo;
     const char *prefix;
     unsigned int len;
+    const char *desc;
 };
 
 struct salt_prefix salt_prefixes[] = {
-    { "des",	"",	2 },
-    { "md5",	"$1$",	8 },
+    { "des",		"",	2, N_("\tstandard 56 bit DES-based crypt(3)") },
+    { "md5",		"$1$",	8, "\tMD5" },
+#if defined OpenBSD || defined FreeBSD
+    { "blf",		"$2$", 16, "\tBlowfish" },
+#endif
 };
 
 void generate_salt(char *buf, const unsigned int len);
@@ -62,12 +69,11 @@ void display_algorithms(void);
 int main(int argc, char *argv[])
 {
     int ch;
-    int use_stdin = 0;
+    int password_fd = -1;
     unsigned int i, salt_len = 0;
     const char *salt_prefix = NULL;
     char *salt = NULL;
     char *password = NULL;
-    unsigned char *p;
 
 #ifdef ENABLE_NLS
     setlocale(LC_ALL, "");
@@ -75,16 +81,10 @@ int main(int argc, char *argv[])
     textdomain(NLS_CAT_NAME);
 #endif
 
-    while ((ch = GETOPT_LONGISH(argc, argv, "hH:sS:V", longopts, 0)) > 0) {
+    while ((ch = GETOPT_LONGISH(argc, argv, "hHP:sS:V", longopts, 0)) > 0) {
 	switch (ch) {
-	case 's':
-	    use_stdin = 1;
-	    break;
-	case 'S':
-	    salt = optarg;
-	    break;
 	case 'H':
-	    if (!*optarg) {
+	    if (!optarg) {
 		display_algorithms();
 		exit(0);
 	    }
@@ -99,6 +99,22 @@ int main(int argc, char *argv[])
 		exit(1);
 	    }
 	    break;
+	case 'P':
+	    {
+		char *p;
+		password_fd = strtol(optarg, &p, 10);
+		if (p == NULL || *p != '\0' || password_fd < 0) {
+		    fprintf(stderr, _("Invalid number '%s'.\n"), optarg);
+		    exit(1);
+		}
+	    }
+	    break;
+	case 's':
+	    password_fd = 0;
+	    break;
+	case 'S':
+	    salt = optarg;
+	    break;
 	case 'V':
 	    display_version();
 	    exit(0);
@@ -132,15 +148,16 @@ int main(int argc, char *argv[])
     }
 
     if (salt) {
-	i = strlen(salt);
-	if (i != salt_len) {
-	    fprintf(stderr, _("Wrong salt length: %d byte(s) instead of %d.\n"),
-		    i, salt_len);
+	unsigned int c = strlen(salt);
+	if (c != salt_len) {
+	    fprintf(stderr,
+		    _("Wrong salt length: %d byte(s) when %d expected.\n"),
+		    c, salt_len);
 	    exit(1);
 	}
-	while (i-- > 0)
-	    if (strchr(valid_salts, salt[i]) == NULL) {
-		fprintf(stderr, _("Illegal salt character '%c'.\n"), salt[i]);
+	while (c-- > 0)
+	    if (strchr(valid_salts, salt[c]) == NULL) {
+		fprintf(stderr, _("Illegal salt character '%c'.\n"), salt[c]);
 		exit(1);
 	    }
     } else {
@@ -149,14 +166,23 @@ int main(int argc, char *argv[])
     }
 
     if (!password) {
-	if (use_stdin) {
-	    if (isatty(STDIN_FILENO))
+	if (password_fd != -1) {
+	    FILE *fp;
+	    unsigned char *p;
+
+	    if (isatty(password_fd))
 		fprintf(stderr, _("Password: "));
 	    password = malloc(128);
-	    if (!fgets(password, sizeof password, stdin)) {
-		perror("fgets:");
+	    fp = fdopen(password_fd, "r");
+	    if (!fp) {
+		perror("fdopen");
 		exit(2);
 	    }
+	    if (!fgets(password, 128, fp)) {
+		perror("fgets");
+		exit(2);
+	    }
+
 	    p = password;
 	    while (*p) {
 		if (*p == '\n') {
@@ -165,8 +191,8 @@ int main(int argc, char *argv[])
 		}
 		/* which characters are valid? */
 		if (*p > 0x7f) {
-		    fprintf(stderr, _("Illegal password character '0x%hhx'.\n"),
-			    *p);
+		    fprintf(stderr,
+			    _("Illegal password character '0x%hhx'.\n"), *p);
 		    exit(1);
 		}
 		p++;
@@ -174,17 +200,20 @@ int main(int argc, char *argv[])
 	} else {
 	    password = getpass(_("Password: "));
 	    if (!password) {
-		perror("getpass:");
+		perror("getpass");
 		exit(2);
 	    }
 	}
     }
 
-    p = malloc(strlen(salt_prefix) + strlen(salt) + 1);
-    *p = '\0';
-    strcat(p, salt_prefix);
-    strcat(p, salt);
-    printf("%s\n", crypt(password, p));
+    {
+	unsigned char *pw;
+	pw = malloc(strlen(salt_prefix) + strlen(salt) + 1);
+	*pw = '\0';
+	strcat(pw, salt_prefix);
+	strcat(pw, salt);
+	printf("%s\n", crypt(password, pw));
+    }
     exit(0);
 }
 
@@ -205,12 +234,15 @@ void display_help(void)
     fprintf(stderr, _(
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/tty\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"), "<md+whois@linux.it>");
 }
@@ -218,12 +250,16 @@ void display_help(void)
 void display_version(void)
 {
     printf("GNU mkpasswd %s\n\n", VERSION);
-    puts("Copyright (C) 2001 Marco d'Itri\n"
+    puts("Copyright (C) 2001-2002 Marco d'Itri\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 }
 
 void display_algorithms(void)
 {
+    int i;
+
     printf(_("Available algorithms:\n"));
+    for (i = 0; salt_prefixes[i].algo != NULL; i++)
+	printf("%s%s\n", salt_prefixes[i].algo, salt_prefixes[i].desc);
 }
diff --git a/po/de.po b/po/de.po
index 86564b2..e467b63 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: 2001-09-30 16:07+0200\n"
+"POT-Creation-Date: 2002-04-05 15:26+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"
@@ -24,40 +24,41 @@ msgstr ""
 "\n"
 "Senden sie Bugreports an %s.\n"
 
-#: ../whois.c:149 ../whois.c:183
+#: ../whois.c:149 ../whois.c:186
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Benutze Server %s.\n"
 
-#: ../whois.c:160
+#: ../whois.c:163
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Benutze voreingestellten Server %s.\n"
 
-#: ../whois.c:163
+#: ../whois.c:166
 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:169
+#: ../whois.c:172
 msgid "This TLD has no whois server."
 msgstr "Diese TLD hat keinen whois-Server."
 
-#: ../whois.c:173
-msgid "Connecting to whois.internic.net."
+#: ../whois.c:176
+#, fuzzy
+msgid "Connecting to whois.crsnic.net."
 msgstr "Verbinde zu whois.internic.net."
 
-#: ../whois.c:179
-#, c-format
+#: ../whois.c:182
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Found InterNIC referral to %s.\n"
+"Found crsnic referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
 "InterNIC verweist auf %s.\n"
 "\n"
 
-#: ../whois.c:192
+#: ../whois.c:195
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -66,12 +67,12 @@ msgstr ""
 "Suche nach: \"%s\"\n"
 "\n"
 
-#: ../whois.c:242 ../whois.c:245
+#: ../whois.c:245 ../whois.c:248
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:318
+#: ../whois.c:324
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -79,32 +80,32 @@ msgstr ""
 "Es lieί sich nicht feststellen, wer diese IP vergeben hat.\n"
 "Versuche ARIN..."
 
-#: ../whois.c:335
+#: ../whois.c:341
 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:342
+#: ../whois.c:348
 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:352
+#: ../whois.c:358
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Unbekannte AS-Nummer. Bitte upgraden Sie dieses Programm."
 
-#: ../whois.c:382
+#: ../whois.c:388
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Warnung: RIPE-Flags wurden ignoriert (\"traditioneller\" Server)."
 
-#: ../whois.c:446
+#: ../whois.c:452
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Verweis auf %s gefunden bei %s.\n"
 
-#: ../whois.c:463
+#: ../whois.c:469
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,22 +113,22 @@ msgstr ""
 "Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
 "Bitte upgraden sie dieses Programm.\n"
 
-#: ../whois.c:533
+#: ../whois.c:543
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s nicht gefunden."
 
-#: ../whois.c:543
+#: ../whois.c:553
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: unbekannter Dienst"
 
-#: ../whois.c:560
+#: ../whois.c:570
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Erhielt Signal %d, unterbrochen..."
 
-#: ../whois.c:592
+#: ../whois.c:613
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
@@ -191,58 +192,69 @@ msgstr ""
 "      --help           zeige diese Hilfe\n"
 "      --version        zeige Version\n"
 
-#: ../mkpasswd.c:101
+#: ../mkpasswd.c:57
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr ""
+
+#: ../mkpasswd.c:98
 #, c-format
 msgid "Invalid hash type '%s'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:107
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr ""
+
+#: ../mkpasswd.c:125
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: ../mkpasswd.c:140
+#: ../mkpasswd.c:154
 #, c-format
-msgid "Wrong salt length: %d byte(s) instead of %d.\n"
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr ""
 
-#: ../mkpasswd.c:146
+#: ../mkpasswd.c:160
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:157 ../mkpasswd.c:178
+#: ../mkpasswd.c:174 ../mkpasswd.c:201
 msgid "Password: "
 msgstr ""
 
-#: ../mkpasswd.c:171
+#: ../mkpasswd.c:195
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:206
+#: ../mkpasswd.c:232
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
 
-#: ../mkpasswd.c:209
+#: ../mkpasswd.c:235
 #, c-format
 msgid ""
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/"
-"tty\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 ""
 
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:262
 msgid "Available algorithms:\n"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 7315178..2cf791d 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-09-30 16:07+0200\n"
+"POT-Creation-Date: 2002-04-05 15:26+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"
@@ -24,42 +24,43 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../whois.c:149 ../whois.c:183
+#: ../whois.c:149 ../whois.c:186
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
 
-#: ../whois.c:160
+#: ../whois.c:163
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Χρήση εξ' ορισμού εξυπηρετητή %s.\n"
 
-#: ../whois.c:163
+#: ../whois.c:166
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
 "βάση whois στο"
 
-#: ../whois.c:169
+#: ../whois.c:172
 msgid "This TLD has no whois server."
 msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
 
-#: ../whois.c:173
-msgid "Connecting to whois.internic.net."
+#: ../whois.c:176
+#, fuzzy
+msgid "Connecting to whois.crsnic.net."
 msgstr "Γίνεται σύνδεση στο whois.internic.net."
 
-#: ../whois.c:179
-#, c-format
+#: ../whois.c:182
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Found InterNIC referral to %s.\n"
+"Found crsnic referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
 "Βρέθηκε αναφορά από το InterNIC στο %s.\n"
 "\n"
 
-#: ../whois.c:192
+#: ../whois.c:195
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -68,12 +69,12 @@ msgstr ""
 "Αλφαριθμητικό ερώτησης: \"%s\"\n"
 "\n"
 
-#: ../whois.c:242 ../whois.c:245
+#: ../whois.c:245 ../whois.c:248
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:318
+#: ../whois.c:324
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -81,30 +82,30 @@ msgstr ""
 "Δε γνωρίζε σε ποιον έχει αποδοθεί ευθύνη για αυτήν την διεύθυνση IP.\n"
 "Θα δοκιμάσω το ARIN και εύχομε για το καλύτερο..."
 
-#: ../whois.c:335
+#: ../whois.c:341
 msgid "I guess it's a netblock name but I don't know where to look it up."
 msgstr ""
 "Πιστεύω ότι είναι όνομα μπλοκ δικτύου αλλά δε γνωρίζω που να το αναζητήσω."
 
-#: ../whois.c:342
+#: ../whois.c:348
 msgid "I guess it's a domain but I don't know where to look it up."
 msgstr "Πιστεύω ότι είναι ένα επίθημα αλλά δε γνωρίζω που να το αναζητήσω."
 
-#: ../whois.c:352
+#: ../whois.c:358
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "¶γνωστος αριθμός AS. Παρακαλώ ενημερώστε αυτό το πρόγραμμα."
 
-#: ../whois.c:382
+#: ../whois.c:388
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr ""
 "Προειδοποίηση: Η σημαίες του RIPE αγνοούνται σε έναν παραδοσιακό εξυπηρετητή."
 
-#: ../whois.c:446
+#: ../whois.c:452
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Ανιχνεύθηκε αναφορά του %s στο %s.\n"
 
-#: ../whois.c:463
+#: ../whois.c:469
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,22 +113,22 @@ msgstr ""
 "Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
 "Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
 
-#: ../whois.c:533
+#: ../whois.c:543
 #, c-format
 msgid "Host %s not found."
 msgstr "Το σύστημα %s δε βρέθηκε."
 
-#: ../whois.c:543
+#: ../whois.c:553
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: άγνωστη υπηρεσία"
 
-#: ../whois.c:560
+#: ../whois.c:570
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Διακοπή από το σήμα %d..."
 
-#: ../whois.c:592
+#: ../whois.c:613
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
@@ -198,58 +199,69 @@ msgstr ""
 "    --help             εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "    --version          εμφάνιση της έκδοσης και έξοδος\n"
 
-#: ../mkpasswd.c:101
+#: ../mkpasswd.c:57
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr ""
+
+#: ../mkpasswd.c:98
 #, c-format
 msgid "Invalid hash type '%s'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:107
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr ""
+
+#: ../mkpasswd.c:125
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: ../mkpasswd.c:140
+#: ../mkpasswd.c:154
 #, c-format
-msgid "Wrong salt length: %d byte(s) instead of %d.\n"
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr ""
 
-#: ../mkpasswd.c:146
+#: ../mkpasswd.c:160
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:157 ../mkpasswd.c:178
+#: ../mkpasswd.c:174 ../mkpasswd.c:201
 msgid "Password: "
 msgstr ""
 
-#: ../mkpasswd.c:171
+#: ../mkpasswd.c:195
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:206
+#: ../mkpasswd.c:232
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
 
-#: ../mkpasswd.c:209
+#: ../mkpasswd.c:235
 #, c-format
 msgid ""
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/"
-"tty\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 ""
 
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:262
 msgid "Available algorithms:\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 79f5cd7..6b79b1f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.12\n"
-"POT-Creation-Date: 2001-09-30 16:07+0200\n"
+"POT-Creation-Date: 2002-04-05 15:26+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"
@@ -24,42 +24,43 @@ msgstr ""
 "\n"
 "Informar de bugs a %s.\n"
 
-#: ../whois.c:149 ../whois.c:183
+#: ../whois.c:149 ../whois.c:186
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Usando el servidor %s.\n"
 
-#: ../whois.c:160
+#: ../whois.c:163
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Usando el servidor predefinido %s.\n"
 
-#: ../whois.c:163
+#: ../whois.c:166
 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:169
+#: ../whois.c:172
 msgid "This TLD has no whois server."
 msgstr "No existe servidor whois para este TLD."
 
-#: ../whois.c:173
-msgid "Connecting to whois.internic.net."
+#: ../whois.c:176
+#, fuzzy
+msgid "Connecting to whois.crsnic.net."
 msgstr "Conectando a whois.internic.net."
 
-#: ../whois.c:179
-#, c-format
+#: ../whois.c:182
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Found InterNIC referral to %s.\n"
+"Found crsnic referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
 "Se ha encontrado en InterNIC una referencia a %s.\n"
 "\n"
 
-#: ../whois.c:192
+#: ../whois.c:195
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -68,12 +69,12 @@ msgstr ""
 "Consulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:242 ../whois.c:245
+#: ../whois.c:245 ../whois.c:248
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "No puedo procesar esta linea: %s"
 
-#: ../whois.c:318
+#: ../whois.c:324
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -81,30 +82,30 @@ msgstr ""
 "Ignoro a quien a sido delegada esta direccion IP.\n"
 "Voy a probar con ARIN a ver si hay suerte..."
 
-#: ../whois.c:335
+#: ../whois.c:341
 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:342
+#: ../whois.c:348
 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:352
+#: ../whois.c:358
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Numero AS desconocido. Por favor, actualice este programa."
 
-#: ../whois.c:382
+#: ../whois.c:388
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr ""
 "Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
 
-#: ../whois.c:446
+#: ../whois.c:452
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Detectada una referencia a %s en %s.\n"
 
-#: ../whois.c:463
+#: ../whois.c:469
 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:533
+#: ../whois.c:543
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s no encontrado."
 
-#: ../whois.c:543
+#: ../whois.c:553
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servicio desconocido"
 
-#: ../whois.c:560
+#: ../whois.c:570
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrumpido por la seρal %d..."
 
-#: ../whois.c:592
+#: ../whois.c:613
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
@@ -193,36 +194,45 @@ msgstr ""
 "      --help       muestra esta pantalla de ayuda y finaliza\n"
 "      --version    muestra la version del programa y finaliza\n"
 
-#: ../mkpasswd.c:101
+#: ../mkpasswd.c:57
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr ""
+
+#: ../mkpasswd.c:98
 #, c-format
 msgid "Invalid hash type '%s'.\n"
 msgstr "La funcion de hash '%s' no es valida.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:107
+#, fuzzy, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "La funcion de hash '%s' no es valida.\n"
+
+#: ../mkpasswd.c:125
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "%s --help para mas informacion.\n"
 
-#: ../mkpasswd.c:140
-#, c-format
-msgid "Wrong salt length: %d byte(s) instead of %d.\n"
+#: ../mkpasswd.c:154
+#, fuzzy, c-format
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Tamaρo de semilla incorrecto: %d bytes en lugar de %d.\n"
 
-#: ../mkpasswd.c:146
+#: ../mkpasswd.c:160
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "El caracter '%c' ilegal en la semilla.\n"
 
-#: ../mkpasswd.c:157 ../mkpasswd.c:178
+#: ../mkpasswd.c:174 ../mkpasswd.c:201
 msgid "Password: "
 msgstr "Clave: "
 
-#: ../mkpasswd.c:171
+#: ../mkpasswd.c:195
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "El caracter '0x%hhx' es ilegal en la clave.\n"
 
-#: ../mkpasswd.c:206
+#: ../mkpasswd.c:232
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
@@ -232,25 +242,26 @@ msgstr ""
 "Encripta CLAVE utilizando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:209
-#, c-format
+#: ../mkpasswd.c:235
+#, fuzzy, c-format
 msgid ""
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/"
-"tty\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=TIPO       selecciona la funcion hash TIPO\n"
 "      -S, --salt=SEMILLA    utiliza la SEMILLA indicada\n"
-"      -s, --stdin           lee la clave de stdin en lugar de /dev/"
-"tty\n"
+"      -s, --stdin           lee la clave de stdin en lugar de /dev/tty\n"
 "      -h, --help            muestra este mensaje de ayuda\n"
 "      -v, --version         muestra la version del programa\n"
 "\n"
@@ -259,6 +270,6 @@ msgstr ""
 "\n"
 "Informar de bugs a: %s.\n"
 
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:262
 msgid "Available algorithms:\n"
 msgstr "Algoritmos disponibles:\n"
diff --git a/po/it.po b/po/it.po
index 6a44fd9..78409a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.13\n"
-"POT-Creation-Date: 2001-09-30 16:07+0200\n"
-"PO-Revision-Date: 2001-09-23 18:32+0200\n"
+"POT-Creation-Date: 2002-04-05 15:26+0200\n"
+"PO-Revision-Date: 2002-04-05 15:26+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,41 +24,41 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../whois.c:149 ../whois.c:183
+#: ../whois.c:149 ../whois.c:186
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Uso il server %s.\n"
 
-#: ../whois.c:160
+#: ../whois.c:163
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Uso il server predefinito %s.\n"
 
-#: ../whois.c:163
+#: ../whois.c:166
 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:169
+#: ../whois.c:172
 msgid "This TLD has no whois server."
 msgstr "Per questo TLD non esiste un server whois."
 
-#: ../whois.c:173
-msgid "Connecting to whois.internic.net."
-msgstr "Mi sto connettendo a whois.internic.net."
+#: ../whois.c:176
+msgid "Connecting to whois.crsnic.net."
+msgstr "Mi sto connettendo a whois.crsnic.net."
 
-#: ../whois.c:179
+#: ../whois.c:182
 #, c-format
 msgid ""
 "\n"
-"Found InterNIC referral to %s.\n"
+"Found crsnic referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
-"Trovato un riferimento di InterNIC a %s.\n"
+"Trovato un riferimento di CRSNIC a %s.\n"
 "\n"
 
-#: ../whois.c:192
+#: ../whois.c:195
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -67,12 +67,12 @@ msgstr ""
 "Richiesta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:242 ../whois.c:245
+#: ../whois.c:245 ../whois.c:248
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossibile interpretare questa riga: %s"
 
-#: ../whois.c:318
+#: ../whois.c:324
 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:335
+#: ../whois.c:341
 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:342
+#: ../whois.c:348
 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:352
+#: ../whois.c:358
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Numero dell'AS sconosciuto. Per favore aggiorna il programma."
 
-#: ../whois.c:382
+#: ../whois.c:388
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Attenzione: i flag RIPE sono ignorati dai server tradizionali."
 
-#: ../whois.c:446
+#: ../whois.c:452
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Trovato un riferimento a %s su %s.\n"
 
-#: ../whois.c:463
+#: ../whois.c:469
 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:533
+#: ../whois.c:543
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s non trovato."
 
-#: ../whois.c:543
+#: ../whois.c:553
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servizio sconosciuto"
 
-#: ../whois.c:560
+#: ../whois.c:570
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrotto dal segnale %d..."
 
-#: ../whois.c:592
+#: ../whois.c:613
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
@@ -189,36 +189,45 @@ msgstr ""
 "      --help           mostra questo aiuto ed esce\n"
 "      --version        stampa le informazioni sulla versione ed esce\n"
 
-#: ../mkpasswd.c:101
+#: ../mkpasswd.c:57
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr "\tcrypt(3) standard a 56 bit basata su DES"
+
+#: ../mkpasswd.c:98
 #, c-format
 msgid "Invalid hash type '%s'.\n"
 msgstr "Il tipo di hash '%s' non θ valido.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:107
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "Il numero '%s' non θ valido.\n"
+
+#: ../mkpasswd.c:125
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Per maggior informazioni prova '%s --help'.\n"
 
-#: ../mkpasswd.c:140
+#: ../mkpasswd.c:154
 #, c-format
-msgid "Wrong salt length: %d byte(s) instead of %d.\n"
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Lunghezza del sale sbagliata: %d byte invece di %d.\n"
 
-#: ../mkpasswd.c:146
+#: ../mkpasswd.c:160
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Il carattere '%c' non θ valido in un sale.\n"
 
-#: ../mkpasswd.c:157 ../mkpasswd.c:178
+#: ../mkpasswd.c:174 ../mkpasswd.c:201
 msgid "Password: "
 msgstr "Password: "
 
-#: ../mkpasswd.c:171
+#: ../mkpasswd.c:195
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Il carattere '0x%hhx' non θ valido in una password.\n"
 
-#: ../mkpasswd.c:206
+#: ../mkpasswd.c:232
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
@@ -228,32 +237,38 @@ msgstr ""
 "Cifra la PASSWORD usando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:209
+#: ../mkpasswd.c:235
 #, c-format
 msgid ""
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/"
-"tty\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=TIPO       seleziona il TIPO di hash\n"
 "      -S, --salt=SALE       usa il SALE specificato\n"
-"      -s, --stdin           legge la password da stdin invece che da /dev/"
-"tty\n"
+"      -P, --password-fd=NUM legge la password dal file descriptor NUM\n"
+"                            invece che da /dev/tty\n"
+"      -s, --stdin           come --password-fd=0\n"
 "      -h, --help            mostra questo aiuto ed esce\n"
+"      -v, --version         mostra le informazioni sulla versione ed esce\n"
 "\n"
 "Se la PASSWORD non θ specificata allora viene chiesta interattivamente.\n"
 "Se il SALE non θ specificato ne viene generato uno casuale.\n"
+"Se il TIPO non θ specificato viene stampata la lista degli algoritmi\n"
+"disponibili.\n"
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:262
 msgid "Available algorithms:\n"
 msgstr "Algoritmi disponibili:\n"
diff --git a/po/no.po b/po/no.po
index 0c96875..0865262 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-09-30 16:07+0200\n"
+"POT-Creation-Date: 2002-04-05 15:26+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"
@@ -22,40 +22,41 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:149 ../whois.c:183
+#: ../whois.c:149 ../whois.c:186
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Bruker tjener %s.\n"
 
-#: ../whois.c:160
+#: ../whois.c:163
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Bruker standardtjener %s.\n"
 
-#: ../whois.c:163
+#: ../whois.c:166
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:169
+#: ../whois.c:172
 msgid "This TLD has no whois server."
 msgstr ""
 
-#: ../whois.c:173
-msgid "Connecting to whois.internic.net."
+#: ../whois.c:176
+#, fuzzy
+msgid "Connecting to whois.crsnic.net."
 msgstr "Kobler opp mot whois.internic.net."
 
-#: ../whois.c:179
-#, c-format
+#: ../whois.c:182
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Found InterNIC referral to %s.\n"
+"Found crsnic referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
 "Fant InterNIC-referanse til %s.\n"
 "\n"
 
-#: ../whois.c:192
+#: ../whois.c:195
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -64,12 +65,12 @@ msgstr ""
 "Forespψrsel: \"%s\"\n"
 "\n"
 
-#: ../whois.c:242 ../whois.c:245
+#: ../whois.c:245 ../whois.c:248
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:318
+#: ../whois.c:324
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -77,28 +78,28 @@ msgstr ""
 "Vet ikke hvor denne IP-adressen har blitt delegert.\n"
 "Prψver ARIN og hεper det beste..."
 
-#: ../whois.c:335
+#: ../whois.c:341
 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:342
+#: ../whois.c:348
 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:352
+#: ../whois.c:358
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
 
-#: ../whois.c:382
+#: ../whois.c:388
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
 
-#: ../whois.c:446
+#: ../whois.c:452
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Referanse til %s vedrψrende %s.\n"
 
-#: ../whois.c:463
+#: ../whois.c:469
 #, fuzzy
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
@@ -107,22 +108,22 @@ msgstr ""
 "Alvorlig feil: INTERNIC har endret standardtekst.\n"
 "Vennligst oppdater programmet.\n"
 
-#: ../whois.c:533
+#: ../whois.c:543
 #, c-format
 msgid "Host %s not found."
 msgstr "Finner ikke verten %s."
 
-#: ../whois.c:543
+#: ../whois.c:553
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: ukjent port"
 
-#: ../whois.c:560
+#: ../whois.c:570
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Avbrudt av signal %d..."
 
-#: ../whois.c:592
+#: ../whois.c:613
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -180,58 +181,69 @@ msgstr ""
 "\n"
 "Versjon %s. Rapporter feil til %s.\n"
 
-#: ../mkpasswd.c:101
+#: ../mkpasswd.c:57
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr ""
+
+#: ../mkpasswd.c:98
 #, c-format
 msgid "Invalid hash type '%s'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:107
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr ""
+
+#: ../mkpasswd.c:125
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: ../mkpasswd.c:140
+#: ../mkpasswd.c:154
 #, c-format
-msgid "Wrong salt length: %d byte(s) instead of %d.\n"
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr ""
 
-#: ../mkpasswd.c:146
+#: ../mkpasswd.c:160
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:157 ../mkpasswd.c:178
+#: ../mkpasswd.c:174 ../mkpasswd.c:201
 msgid "Password: "
 msgstr ""
 
-#: ../mkpasswd.c:171
+#: ../mkpasswd.c:195
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:206
+#: ../mkpasswd.c:232
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
 
-#: ../mkpasswd.c:209
+#: ../mkpasswd.c:235
 #, c-format
 msgid ""
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/"
-"tty\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 ""
 
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:262
 msgid "Available algorithms:\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5795ff3..95f8846 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-09-30 16:07+0200\n"
+"POT-Creation-Date: 2002-04-05 15:26+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"
@@ -22,41 +22,42 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:149 ../whois.c:183
+#: ../whois.c:149 ../whois.c:186
 #, c-format
 msgid "Using server %s.\n"
 msgstr "UΏywam serwera %s.\n"
 
-#: ../whois.c:160
+#: ../whois.c:163
 #, c-format
 msgid "Using default server %s.\n"
 msgstr "Uzywam domy¶lnego serwera %s.\n"
 
-#: ../whois.c:163
+#: ../whois.c:166
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:169
+#: ../whois.c:172
 #, fuzzy
 msgid "This TLD has no whois server."
 msgstr "Nie ma serwera whois dla tej domeny."
 
-#: ../whois.c:173
-msgid "Connecting to whois.internic.net."
+#: ../whois.c:176
+#, fuzzy
+msgid "Connecting to whois.crsnic.net."
 msgstr "£±czenie z hostem whois.internic.net."
 
-#: ../whois.c:179
-#, c-format
+#: ../whois.c:182
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Found InterNIC referral to %s.\n"
+"Found crsnic referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
 "Znaleziono odniesienie z InterNIC do %s.\n"
 "\n"
 
-#: ../whois.c:192
+#: ../whois.c:195
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -65,12 +66,12 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:242 ../whois.c:245
+#: ../whois.c:245 ../whois.c:248
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:318
+#: ../whois.c:324
 msgid ""
 "I don't know where this IP has been delegated.\n"
 "I'll try ARIN and hope for the best..."
@@ -78,28 +79,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:335
+#: ../whois.c:341
 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:342
+#: ../whois.c:348
 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:352
+#: ../whois.c:358
 msgid "Unknown AS number. Please upgrade this program."
 msgstr "Nieznany numer AS. Zainstaluj nowsz± wersjκ programu."
 
-#: ../whois.c:382
+#: ../whois.c:388
 msgid "Warning: RIPE flags ignored for a traditional server."
 msgstr "Uwaga: flagi RIPE s± ignorowane dla starszych serwerσw."
 
-#: ../whois.c:446
+#: ../whois.c:452
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Wykryto odniesienie do %s na %s.\n"
 
-#: ../whois.c:463
+#: ../whois.c:469
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -107,22 +108,22 @@ msgstr ""
 "Katastrofa! Tekst disclaimera zosta³ zmieniony.\n"
 "¦ci±gnij nowsz± wersjκ programu.\n"
 
-#: ../whois.c:533
+#: ../whois.c:543
 #, c-format
 msgid "Host %s not found."
 msgstr "Serwer %s nie zosta³ znaleziony."
 
-#: ../whois.c:543
+#: ../whois.c:553
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: us³uga nieznana"
 
-#: ../whois.c:560
+#: ../whois.c:570
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Przerwanie na sygna³ %d..."
 
-#: ../whois.c:592
+#: ../whois.c:613
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -177,58 +178,69 @@ msgstr ""
 "\n"
 "Wersja %s. Informacje o b³κdach kieruj do %s. T³umaczenie: cefek.\n"
 
-#: ../mkpasswd.c:101
+#: ../mkpasswd.c:57
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr ""
+
+#: ../mkpasswd.c:98
 #, c-format
 msgid "Invalid hash type '%s'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:107
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr ""
+
+#: ../mkpasswd.c:125
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: ../mkpasswd.c:140
+#: ../mkpasswd.c:154
 #, c-format
-msgid "Wrong salt length: %d byte(s) instead of %d.\n"
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr ""
 
-#: ../mkpasswd.c:146
+#: ../mkpasswd.c:160
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:157 ../mkpasswd.c:178
+#: ../mkpasswd.c:174 ../mkpasswd.c:201
 msgid "Password: "
 msgstr ""
 
-#: ../mkpasswd.c:171
+#: ../mkpasswd.c:195
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:206
+#: ../mkpasswd.c:232
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
 
-#: ../mkpasswd.c:209
+#: ../mkpasswd.c:235
 #, c-format
 msgid ""
 "      -H, --hash=TYPE       select hash TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
-"      -s, --stdin           read the password from stdin instead of /dev/"
-"tty\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 ""
 
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:262
 msgid "Available algorithms:\n"
 msgstr ""
diff --git a/tld_serv_list b/tld_serv_list
index 7ea2d12..869503b 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -72,7 +72,7 @@
 .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
-.bz	NONE		# www.nic.nz
+.bz	whois.belizenic.bz
 .ca	whois.cira.ca
 .cc	whois.nic.cc
 .cd	whois.nic.cd
@@ -101,7 +101,7 @@
 .do	WEB http://www.nic.do
 .dz	NONE
 .ec	WEB http://www.nic.ec
-.ee	WEB http://www.eenet.ee/info/index.html
+.ee	WEB http://www.eenet.ee/info/
 #.eg	NONE		# NIC? http://www.frcu.eun.eg
 #.eh
 #.er	NONE		# NIC? www.noc.net.er (recently connected!)
@@ -119,7 +119,7 @@
 #.gd			# NO NIC (UPR)
 .ge	WEB http://www.nic.net.ge
 .gf	whois.nplus.gf
-.gg	NONE		# http://www.isles.net
+.gg	whois.channelisles.net
 .gh	NONE		# http://www.ghana.com/domreg.html
 .gi	NONE		# http://www.gibnet.gi/nic/
 .gl	whois.ripe.net
@@ -133,10 +133,10 @@
 .gu	WEB http://gadao.gov.gu/Scripts/wwsquery/wwsquery.dll?hois=guamquery
 #.gw			# no NIC?
 #.gy			# NIC? (UPR)
-.hk	whois.hkdnr.net.hk
+.hk	WEB http://web.hkdnr.net.hk/hkdnr/
 .hm	whois.registry.hm
 .hn	NONE		# www.nic.hn
-.hr	WEB http://noc.srce.hr/web-eng/searchdomain.htm
+.hr	WEB http://www.dns.hr/pretrazivanje.html
 #.ht			# NIC? http://www.haitiworld.com/
 .hu	whois.nic.hu
 .id	whois.idnic.net.id
@@ -146,10 +146,10 @@
 .in	whois.ncst.ernet.in
 .io	WEB http://www.io.io/whois.html
 #.iq			# NIC?
-.ir	WEB http://aria.nic.ir/forms/whois.html
+.ir	whois.nic.ir
 .is	whois.isnet.is
 .it	whois.nic.it
-.je	NONE 		# http://www.isles.net
+.je	whois.channelisles.net
 #.jm			# NIC? uwimona.edu.jm http://nic.jm
 .jo	WEB http://amon.nic.gov.jo/dns/
 .jp	whois.nic.ad.jp
@@ -194,7 +194,7 @@
 #.mv			# NIC? dhiraagu.com.mv
 .mw	WEB http://www.tarsus.net/whois/
 .mx	whois.nic.mx
-.my	NONE		# http://www.mynic.net
+.my	WEB http://www.mynic.net.my/newhp/mynic-lookup.htm
 #.mz			# NIC? www.uem.mz
 .na	WEB http://www.lisse.na/cgi-bin/whois.cgi
 .nc	whois.cctld.nc
@@ -210,14 +210,14 @@
 .nz	whois.domainz.net.nz
 #.om	NONE		# NIC? http://www.gto.net.om
 .pa	WEB http://www.nic.pa
-.pe	whois.rcp.net.pe
+.pe	whois.nic.pe
 #.pf			# NIC? mana.pf
 .pg	NONE	# http://www.unitech.ac.pg/Unitech_General/ITS/ITS_Dns.htm
 .ph	WEB http://www.names.ph/search.html
 #.pk	whois.pknic.net.pk	# the host does not exist anymore
 .pl	whois.dns.pl
 .pm	whois.nic.fr
-.pn	NONE		# www.nic.pn
+.pn	NONE		# 2day.com www.nic.pn
 .pr	NONE		# http://www.uprr.pr/main.html
 .ps	WEB http://www.nic.ps/whois/
 .pt	NONE		# www.dns.pt
@@ -254,7 +254,7 @@
 .tg	WEB http://www.nic.tg
 .th	whois.thnic.net
 .tj	whois.nic.tj
-.tk	NONE		# 2day.com
+.tk	whois.dot.tk
 .tm	whois.nic.tm
 .tn	NONE		# http://www.ati.tn/Nic/
 .to	whois.tonic.to
@@ -294,7 +294,6 @@
 .org.za	WEB http://www.org.za/	# rwhois.org.za:4321
 .za	NONE		# http://www2.frd.ac.za/uninet/zadomains.html
 .zm	NONE		# http://www.zamnet.zm/domain.shtml
-.zr	NONE		# obsoleted by cd
 #.zw			# NIC? zptc.co.zw http://www.zispa.co.zw/
 -au-dom	whois.aunic.net
 -dom	whois.networksolutions.com
@@ -325,3 +324,4 @@
 -il	whois.isoc.org.il
 -lrms	whois.afilias.net
 -tw	whois.twnic.net
+-nicir	whois.nic.ir
diff --git a/whois.c b/whois.c
index c14a2b8..52f7896 100644
--- a/whois.c
+++ b/whois.c
@@ -173,13 +173,13 @@ int main(int argc, char *argv[])
 		exit(0);
 	    case 4:
 		if (verb)
-		    puts(_("Connecting to whois.internic.net."));
-		sockfd = openconn("whois.internic.net", NULL);
+		    puts(_("Connecting to whois.crsnic.net."));
+		sockfd = openconn("whois.crsnic.net", NULL);
 		server = query_crsnic(sockfd, qstring);
 		closeconn(sockfd);
 		if (!server)
 		    exit(0);
-		printf(_("\nFound InterNIC referral to %s.\n\n"), server);
+		printf(_("\nFound crsnic referral to %s.\n\n"), server);
 		break;
 	    default:
 		if (verb)
@@ -354,7 +354,7 @@ const char *whereas(int asn, struct as_del aslist[])
 {
     int i;
 
-    if (asn > 23551)
+    if (asn > 25599)
 	puts(_("Unknown AS number. Please upgrade this program."));
     for (i = 0; aslist[i].serv; i++)
 	if (asn >= aslist[i].first && asn <= aslist[i].last)
@@ -512,8 +512,8 @@ int openconn(const char *server, const char *port)
 {
     int fd;
 #ifdef HAVE_GETADDRINFO
-    int i;
-    struct addrinfo hints, *res, *ressave;
+    int err;
+    struct addrinfo hints, *res, *ai;
 #else
     struct hostent *hostinfo;
     struct servent *servinfo;
@@ -525,18 +525,18 @@ int openconn(const char *server, const char *port)
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 
-    if ((i = getaddrinfo(server, port ? port : "whois", &hints, &res)) != 0)
-	err_quit("getaddrinfo: %s", gai_strerror(i));
-    for (ressave = res; res; res = res->ai_next) {
-	if ((fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol))<0)
+    if ((err = getaddrinfo(server, port ? port : "whois", &hints, &res)) != 0)
+	err_quit("getaddrinfo: %s", gai_strerror(err));
+    for (ai = res; ai; ai = ai->ai_next) {
+	if ((fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol)) < 0)
 	    continue;		/* ignore */
-	if (connect(fd, (struct sockaddr *)res->ai_addr, res->ai_addrlen) == 0)
+	if (connect(fd, (struct sockaddr *)ai->ai_addr, ai->ai_addrlen) == 0)
 	    break;		/* success */
 	close(fd);
     }
-    freeaddrinfo(ressave);
+    freeaddrinfo(res);
 
-    if (!res)
+    if (!ai)
 	err_sys("connect");
 #else
     if ((hostinfo = gethostbyname(server)) == NULL)
diff --git a/whois.spec b/whois.spec
index 12fb09e..5fd48e0 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.5.19
+Version: 4.5.24
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>