emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

src: correct "badname" option

Browse Source 
Change "badnames" to "badname" as this is the accepted option name.

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa 2022-05-04 09:33:59 +02:00 committed by Serge Hallyn
parent edf5ea7974
commit 45d6746219
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newusers.c
View File

@ -116,7 +116,7 @@ static void usage (int status)
"\n" "\n"
"Options:\n"), "Options:\n"),
Prog); Prog);
(void) fputs (_(" -b, --badnames allow bad names\n"), usageout); (void) fputs (_(" -b, --badname allow bad names\n"), usageout);
#ifndef USE_PAM #ifndef USE_PAM
(void) fprintf (usageout, (void) fprintf (usageout,
_(" -c, --crypt-method METHOD the crypt method (one of %s)\n"), _(" -c, --crypt-method METHOD the crypt method (one of %s)\n"),
@ -615,7 +615,7 @@ static void process_flags (int argc, char **argv)
#endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */ #endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
#endif /* !USE_PAM */ #endif /* !USE_PAM */
static struct option long_options[] = { static struct option long_options[] = {
{"badnames", no_argument, NULL, 'b'}, {"badname", no_argument, NULL, 'b'},
#ifndef USE_PAM #ifndef USE_PAM
{"crypt-method", required_argument, NULL, 'c'}, {"crypt-method", required_argument, NULL, 'c'},
#endif /* !USE_PAM */ #endif /* !USE_PAM */

4
src/pwck.c
View File

@ -128,7 +128,7 @@ static /*@noreturn@*/void usage (int status)
"Options:\n"), "Options:\n"),
Prog); Prog);
} }
(void) fputs (_(" -b, --badnames allow bad names\n"), usageout); (void) fputs (_(" -b, --badname allow bad names\n"), usageout);
(void) fputs (_(" -h, --help display this help message and exit\n"), usageout); (void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
(void) fputs (_(" -q, --quiet report errors only\n"), usageout); (void) fputs (_(" -q, --quiet report errors only\n"), usageout);
(void) fputs (_(" -r, --read-only display errors and warnings\n" (void) fputs (_(" -r, --read-only display errors and warnings\n"
@ -153,7 +153,7 @@ static void process_flags (int argc, char **argv)
{ {
int c; int c;
static struct option long_options[] = { static struct option long_options[] = {
{"badnames", no_argument, NULL, 'b'}, {"badname", no_argument, NULL, 'b'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"quiet", no_argument, NULL, 'q'}, {"quiet", no_argument, NULL, 'q'},
{"read-only", no_argument, NULL, 'r'}, {"read-only", no_argument, NULL, 'r'},

4
src/useradd.c
View File

@ -899,7 +899,7 @@ static void usage (int status)
"\n" "\n"
"Options:\n"), "Options:\n"),
Prog, Prog, Prog); Prog, Prog, Prog);
(void) fputs (_(" --badnames do not check for bad names\n"), usageout); (void) fputs (_(" --badname do not check for bad names\n"), usageout);
(void) fputs (_(" -b, --base-dir BASE_DIR base directory for the home directory of the\n" (void) fputs (_(" -b, --base-dir BASE_DIR base directory for the home directory of the\n"
" new account\n"), usageout); " new account\n"), usageout);
#ifdef WITH_BTRFS #ifdef WITH_BTRFS
@ -1189,7 +1189,7 @@ static void process_flags (int argc, char **argv)
#ifdef WITH_BTRFS #ifdef WITH_BTRFS
{"btrfs-subvolume-home", no_argument, NULL, 200}, {"btrfs-subvolume-home", no_argument, NULL, 200},
#endif #endif
{"badnames", no_argument, NULL, 201}, {"badname", no_argument, NULL, 201},
{"comment", required_argument, NULL, 'c'}, {"comment", required_argument, NULL, 'c'},
{"home-dir", required_argument, NULL, 'd'}, {"home-dir", required_argument, NULL, 'd'},
{"defaults", no_argument, NULL, 'D'}, {"defaults", no_argument, NULL, 'D'},

2
src/usermod.c
View File

@ -370,7 +370,7 @@ static /*@noreturn@*/void usage (int status)
(void) fputs (_(" -a, --append append the user to the supplemental GROUPS\n" (void) fputs (_(" -a, --append append the user to the supplemental GROUPS\n"
" mentioned by the -G option without removing\n" " mentioned by the -G option without removing\n"
" the user from other groups\n"), usageout); " the user from other groups\n"), usageout);
(void) fputs (_(" -b, --badnames allow bad names\n"), usageout); (void) fputs (_(" -b, --badname allow bad names\n"), usageout);
(void) fputs (_(" -c, --comment COMMENT new value of the GECOS field\n"), usageout); (void) fputs (_(" -c, --comment COMMENT new value of the GECOS field\n"), usageout);
(void) fputs (_(" -d, --home HOME_DIR new home directory for the user account\n"), usageout); (void) fputs (_(" -d, --home HOME_DIR new home directory for the user account\n"), usageout);
(void) fputs (_(" -e, --expiredate EXPIRE_DATE set account expiration date to EXPIRE_DATE\n"), usageout); (void) fputs (_(" -e, --expiredate EXPIRE_DATE set account expiration date to EXPIRE_DATE\n"), usageout);