From 87b5ce3036a78e23d03ca96f31d3153d8a5d919d Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 17 Nov 2007 14:49:39 +0000 Subject: [PATCH] Use the same error message for the below errors. (option working ONLY if another is specified). --- ChangeLog | 5 +++++ src/usermod.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fecce194..eda82668 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-17 Nicolas François + + * src/usermod.c: Use the same error message for the below errors. + (option working ONLY if another is specified). + 2007-11-17 Nicolas François * src/usermod.c: Make usermod -o and -u work independently of the diff --git a/src/usermod.c b/src/usermod.c index a0bbab2b..885dadae 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -1038,8 +1038,8 @@ static void process_flags (int argc, char **argv) if (aflg && (!Gflg)) { fprintf (stderr, - _("%s: -a flag is ONLY allowed with the -G flag\n"), - Prog); + _("%s: %s flag is ONLY allowed with the %s flag\n"), + Prog, "-a", "-G"); usage (); exit (E_USAGE); } @@ -1054,16 +1054,16 @@ static void process_flags (int argc, char **argv) if (oflg && !uflg) { fprintf (stderr, - _("%s: -o flag is ONLY allowed with the -u flag\n"), - Prog); + _("%s: %s flag is ONLY allowed with the %s flag\n"), + Prog, "-o", "-u"); usage (); exit (E_USAGE); } if (mflg && !dflg) { fprintf (stderr, - _("%s: -m flag is ONLY allowed with the -d flag\n"), - Prog); + _("%s: %s flag is ONLY allowed with the %s flag\n"), + Prog, "-m", "-d"); usage (); exit (E_USAGE); }