Merging upstream version 5.5.12.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 29 insertions, 12 deletions

diff --git a/mkpasswd.c b/mkpasswd.c
index 426e93a..8c9bd00 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -283,8 +283,18 @@ int main(int argc, char *argv[])
 	rounds_str[0] = '\0';
 
     if (salt_arg && salt_arg[0] == '$')
+	/* the salt begins with the prefix which specifies the method */
 	salt = NOFAIL(strdup(salt_arg));
-    else if (salt_arg && salt_arg[0] != '\0') {
+    else if (salt_prefix && salt_arg && strchr(salt_arg, '$')) {
+	/* looks like a salt, but with no initial method prefix */
+	salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
+		+ strlen(salt_arg) + 1));
+	*salt = '\0';
+	strcat(salt, salt_prefix);
+	strcat(salt, rounds_str);
+	strcat(salt, salt_arg);
+    } else if (salt_arg && salt_arg[0] != '\0') {
+	/* just the salt string with no metadata */
 	unsigned int c = strlen(salt_arg);
 	if (c < salt_minlen || c > salt_maxlen) {
 	    if (salt_minlen == salt_maxlen)
@@ -309,6 +319,10 @@ int main(int argc, char *argv[])
 	    }
 	}
 
+	/*
+	 * Build the actual argument to crypt(3) by concatenating the
+	 * method prefix, the rounds metadata (if any) and the salt string.
+	 */
 	salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
 		+ strlen(salt_arg) + 1));
 	*salt = '\0';
@@ -316,6 +330,7 @@ int main(int argc, char *argv[])
 	strcat(salt, rounds_str);
 	strcat(salt, salt_arg);
     } else {
+	/* no salt was specified by the user, so generate one */
 #ifdef HAVE_SOLARIS_CRYPT_GENSALT
 	salt = crypt_gensalt(salt_prefix, NULL);
 	if (!salt) {
diff --git a/new_gtlds_list b/new_gtlds_list
index 17513c4..2241cf9 100644
--- a/new_gtlds_list
+++ b/new_gtlds_list
@@ -145,7 +145,6 @@ broadway
 broker
 brother
 brussels
-budapest
 bugatti
 build
 builders
@@ -249,7 +248,6 @@ crown
 crs
 cruise
 cruises
-csc
 cuisinella
 cymru
 cyou
diff --git a/po/de.po b/po/de.po
index c58dcea..898e443 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,15 +1,18 @@
 # Translation of whois to German
-# Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>, 2004 Adrian
-# Bunk <bunk@fs.tum.de>, 2010, 2013, 2019 Chris Leick <c.leick@vollbio.de>.
+# Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>
+# Copyright (C) 2004 Adrian Bunk <bunk@fs.tum.de>
+# Copyright (C) 2010, 2013, 2019 Chris Leick <c.leick@vollbio.de>
+# Copyright (C) 2021 Helge Kreutzmann <debian@helgefjell.de>
+#
 # This file is distributed under the same license as the whois package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.4.4\n"
+"Project-Id-Version: whois 5.5.11\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-01-03 17:52+0100\n"
-"PO-Revision-Date: 2019-06-28 18:02+0200\n"
-"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
+"PO-Revision-Date: 2022-01-12 12:11+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -152,7 +155,7 @@ msgstr ""
 "-H                     versteckt Haftungsausschlussklauseln.\n"
 
 #: ../whois.c:1506
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "      --verbose        explain what is being done\n"
 "      --no-recursion   disable recursion from registry to registrar servers\n"
@@ -161,6 +164,7 @@ msgid ""
 "\n"
 msgstr ""
 "      --verbose        erklärt, was getan wird.\n"
+"      --no-recursion   deaktiviert Rekursion vom Register zu Registrar-Servern\n"
 "      --help           zeigt diese Hilfe und beendet sich.\n"
 "      --version        gibt Versionsinformationen aus und beendet sich.\n"
 "\n"
@@ -314,7 +318,7 @@ msgid ""
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
-"Aufruf: mkpasswd [OPTIONEN] ... [PASSWORT] [SALT]]\n"
+"Aufruf: mkpasswd [OPTIONEN]... [PASSWORT] [SALT]]\n"
 "Verschlüsselt das PASSWORT mit »crypt(3)«.\n"
 "\n"
 
diff --git a/tld_serv_list b/tld_serv_list
index 7797ca1..17fc2fc 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -53,7 +53,7 @@
 .cat	whois.nic.cat
 .coop	whois.nic.coop
 .info	whois.afilias.net
-.jobs	VERISIGN whois.nic.jobs
+.jobs	whois.nic.jobs
 .mobi	whois.afilias.net
 .museum	whois.nic.museum
 .name	whois.nic.name
diff --git a/whois.c b/whois.c
index 622c7cc..e09c74e 100644
--- a/whois.c
+++ b/whois.c
@@ -1135,7 +1135,7 @@ int japanese_locale(void)
 {
     char *lang;
 
-    lang = getenv("LC_MESSAGE");
+    lang = getenv("LC_MESSAGES");
     if (lang) {
 	if (strneq(lang, "ja", 2))
 	    return 0;