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

* NEWS, src/userdel.c, src/lastlog.c, src/gpasswd.c,

Browse Source 
src/newusers.c, src/chpasswd.c, src/groupmems.c, src/usermod.c,
	src/chgpasswd.c, src/vipw.c, src/su.c, src/useradd.c,
	src/groupmod.c, src/passwd.c, src/groupadd.c, src/chage.c,
	src/faillog.c, src/chsh.c: If someone uses the -h/--help options,
	the usage should not go to stderr nor should the utility exit with
	non-zero status. All of the shadow utils do just this
	unfortunately, so convert them over to sanity.
	* man/groupmems.8.xml, man/gpasswd.1.xml: Added option -h/--help.
This commit is contained in:
nekral-guest
2009-09-04 23:02:33 +00:00
parent 3d10e75117
commit 91b60a955c
21 changed files with 271 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/usermod.c
View File

@ -149,7 +149,7 @@ static bool sgr_locked = false;
static void date_to_str (char *buf, size_t maxsize,
long int date, const char *negativ);
static int get_groups (char *);
static void usage (void);
static void usage (int status);
static void new_pwent (struct passwd *);
#ifdef WITH_SELINUX
static void selinux_update_mapping (void);
@ -300,9 +300,9 @@ static int get_groups (char *list)
/*
* usage - display usage message and exit
*/
static void usage (void)
static void usage (int status)
{
fprintf (stderr,
fprintf (status ? stderr : stdout,
_("Usage: usermod [options] LOGIN\n"
"\n"
"Options:\n"
@ -334,7 +334,7 @@ static void usage (void)
""
#endif
);
exit (E_USAGE);
exit (status);
}
/*
@ -815,7 +815,7 @@ static void process_flags (int argc, char **argv)
bool anyflag = false;
if ((1 == argc) || ('-' == argv[argc - 1][0])) {
usage ();
usage (E_USAGE);
}
{
@ -955,7 +955,7 @@ static void process_flags (int argc, char **argv)
fprintf (stderr,
_("%s: invalid numeric argument '%s'\n"),
Prog, optarg);
usage ();
usage (E_USAGE);
}
fflg = true;
break;
@ -976,6 +976,8 @@ static void process_flags (int argc, char **argv)
}
Gflg = true;
break;
case 'h':
usage (E_SUCCESS);
case 'l':
if (!is_valid_user_name (optarg)) {
fprintf (stderr,
@ -1036,7 +1038,7 @@ static void process_flags (int argc, char **argv)
break;
#endif
default:
usage ();
usage (E_USAGE);
}
anyflag = true;
}
@ -1092,14 +1094,14 @@ static void process_flags (int argc, char **argv)
}
if (optind != argc - 1) {
usage ();
usage (E_USAGE);
}
if (aflg && (!Gflg)) {
fprintf (stderr,
_("%s: %s flag is only allowed with the %s flag\n"),
Prog, "-a", "-G");
usage ();
usage (E_USAGE);
exit (E_USAGE);
}
@ -1107,7 +1109,7 @@ static void process_flags (int argc, char **argv)
fprintf (stderr,
_("%s: the -L, -p, and -U flags are exclusive\n"),
Prog);
usage ();
usage (E_USAGE);
exit (E_USAGE);
}
@ -1115,7 +1117,7 @@ static void process_flags (int argc, char **argv)
fprintf (stderr,
_("%s: %s flag is only allowed with the %s flag\n"),
Prog, "-o", "-u");
usage ();
usage (E_USAGE);
exit (E_USAGE);
}
@ -1123,7 +1125,7 @@ static void process_flags (int argc, char **argv)
fprintf (stderr,
_("%s: %s flag is only allowed with the %s flag\n"),
Prog, "-m", "-d");
usage ();
usage (E_USAGE);
exit (E_USAGE);
}