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

The -c, -e, and -m options are exclusives.

Browse Source
This commit is contained in:
nekral-guest 2007-11-20 13:09:55 +00:00
parent 6e3ad7a275
commit a30c0a8192
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-11-20 Nicolas François <nicolas.francois@centraliens.net>
* src/chgpasswd.c, src/chpasswd.c: The -c, -e, and -m options are
exclusives.
2007-11-20 Nicolas François <nicolas.francois@centraliens.net> 2007-11-20 Nicolas François <nicolas.francois@centraliens.net>
* man/chpasswd.8.xml, man/chgpasswd.8.xml: Document how the * man/chpasswd.8.xml, man/chgpasswd.8.xml: Document how the

5
src/chgpasswd.c
View File

@ -184,9 +184,10 @@ int main (int argc, char **argv)
Prog, "-s", "-c"); Prog, "-s", "-c");
usage (); usage ();
} }
if (md5flg && cflg) { if ((eflg && (md5flg || cflg)) ||
md5flg && cflg) {
fprintf (stderr, fprintf (stderr,
_("%s: the -m and -c flags are exclusive\n"), _("%s: the -c, -e, and -m flags are exclusive\n"),
Prog); Prog);
usage (); usage ();
} }

5
src/chpasswd.c
View File

@ -178,9 +178,10 @@ int main (int argc, char **argv)
Prog, "-s", "-c"); Prog, "-s", "-c");
usage (); usage ();
} }
if (md5flg && cflg) { if ((eflg && (md5flg || cflg)) ||
md5flg && cflg) {
fprintf (stderr, fprintf (stderr,
_("%s: the -m and -c flags are exclusive\n"), _("%s: the -c, -e, and -m flags are exclusive\n"),
Prog); Prog);
usage (); usage ();
} }