* src/groupmems.c: Check the return value of gr_update().
* src/chage.c, src/chfn.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupmems.c, src/groupmod.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/useradd.c, src/userdel.c, src/usermod.c: Harmonize the error message sent to stderr in case of *_update () failure. * src/chage.c, src/chsh.c, src/groupadd.c, src/passwd.c: Do not log to syslog when pw_update() or spw_update() fail. * src/newusers.c: Do not log specific error message to stderr when sgr_update() fails. * src/pwconv.c: Remove duplicated definition of Prog.
This commit is contained in:
@@ -663,8 +663,7 @@ static void update_age (const struct spwd *sp, const struct passwd *pw)
|
||||
pwent.pw_passwd = SHADOW_PASSWD_STRING; /* XXX warning: const */
|
||||
if (pw_update (&pwent) == 0) {
|
||||
fprintf (stderr,
|
||||
_("%s: cannot update %s\n"), Prog, pw_dbname ());
|
||||
SYSLOG ((LOG_WARN, "cannot update %s", pw_dbname ()));
|
||||
_("%s: failed to prepare the new %s entry '%s'\n"), Prog, pw_dbname (), pwent.pw_name);
|
||||
fail_exit (E_NOPERM);
|
||||
}
|
||||
} else {
|
||||
@@ -687,8 +686,7 @@ static void update_age (const struct spwd *sp, const struct passwd *pw)
|
||||
|
||||
if (spw_update (&spwent) == 0) {
|
||||
fprintf (stderr,
|
||||
_("%s: cannot update %s\n"), Prog, spw_dbname ());
|
||||
SYSLOG ((LOG_WARN, "cannot update %s", spw_dbname ()));
|
||||
_("%s: failed to prepare the new %s entry '%s'\n"), Prog, spw_dbname (), spwent.sp_namp);
|
||||
fail_exit (E_NOPERM);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user