From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Date: Fri, 13 Oct 2023 00:44:11 +0000 (+0100)
Subject: Fix badname option to be singular just like useradd.
X-Git-Tag: 4.15.0-rc1~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=088fe2618fcc286be0686d4c679d225d734427bb;p=thirdparty%2Fshadow.git

Fix badname option to be singular just like useradd.

Badnames still accepted, note that previously usage already stated
singular form, whilst manpage and real one was plural only.

Fixes: 45d6746219 ("src: correct "badname" option")

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---

diff --git a/man/po/de.po b/man/po/de.po
index 856b95f3e..7a56248d2 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -458,8 +458,8 @@ msgid "Add the user to the supplementary group(s). Use only with the <option>-G<
 msgstr "verleiht dem Benutzer zusätzliche, ergänzende Gruppenzugehörigkeiten. Kann nur zusammen mit der Option <option>-G</option> verwendet werden."
 
 #: usermod.8.xml:112(term)
-msgid "<option>-b</option>, <option>--badnames</option>"
-msgstr "<option>-b</option>, <option>--badnames</option>"
+msgid "<option>-b</option>, <option>--badname</option>"
+msgstr "<option>-b</option>, <option>--badname</option>"
 
 #: usermod.8.xml:116(para) useradd.8.xml:135(para) pwck.8.xml:190(para) newusers.8.xml:276(para)
 msgid "Allow names that do not conform to standards."
diff --git a/src/usermod.c b/src/usermod.c
index 5046f9ebe..7d9e661db 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -980,6 +980,7 @@ static void process_flags (int argc, char **argv)
 		int c;
 		static struct option long_options[] = {
 			{"append",       no_argument,       NULL, 'a'},
+			{"badname",      no_argument,       NULL, 'b'},
 			{"badnames",     no_argument,       NULL, 'b'},
 			{"comment",      required_argument, NULL, 'c'},
 			{"home",         required_argument, NULL, 'd'},