* 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:
nekral-guest
2008-08-30 18:27:34 +00:00
parent 38a50366bc
commit d7b55ce2bb
21 changed files with 138 additions and 107 deletions

View File

@@ -577,9 +577,8 @@ static void update_group (struct group *gr)
{
if (gr_update (gr) == 0) {
fprintf (stderr,
_("%s: cannot update entry '%s' in %s\n"),
Prog, gr->gr_name, gr_dbname ());
SYSLOG ((LOG_WARN, "cannot update entry '%s' in %s", gr->gr_name, gr_dbname ()));
_("%s: failed to prepare the new %s entry\n"), Prog, gr_dbname ());
SYSLOG ((LOG_WARN, "failed to prepare the new %s entry", gr_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"updating /etc/group",
@@ -589,8 +588,9 @@ static void update_group (struct group *gr)
}
#ifdef SHADOWGRP
if (is_shadowgrp && (sgr_update (sg) == 0)) {
fprintf (stderr, _("%s: cannot update entry '%s' in %s\n"), Prog, sg->sg_name, sgr_dbname ());
SYSLOG ((LOG_WARN, "cannot update entry '%s' in %s", sg->sg_name, sgr_dbname ()));
fprintf (stderr,
_("%s: failed to prepare the new %s entry\n"), Prog, sgr_dbname ());
SYSLOG ((LOG_WARN, "failed to prepare the new %s entry", sgr_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"updating /etc/gshadow",