* src/chfn.c: Do not exit on pw_unlock failures.
* src/grpconv.c, src/grpunconv.c, src/pwconv.c, src/pwunconv.c, src/vipw.c: Open syslog with the right identification name. * src/vipw.c: Log unlock errors to syslog. * src/vipw.c: Log edits to syslog. * src/chage.c, src/chfn.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c, src/passwd.c, src/pwck.c, src/pwunconv.c, src/useradd.c, src/usermod.c: Harmonize the syslog levels. Failure to close or unlock are errors. Failure to open files are warnings.
This commit is contained in:
@@ -86,6 +86,8 @@ int main (int argc, char **argv)
|
||||
(void) bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
(void) textdomain (PACKAGE);
|
||||
|
||||
OPENLOG ("pwunconv");
|
||||
|
||||
if (!spw_file_present ()) {
|
||||
/* shadow not installed, do nothing */
|
||||
exit (0);
|
||||
@@ -157,6 +159,7 @@ int main (int argc, char **argv)
|
||||
fprintf (stderr,
|
||||
_("%s: failure while writing changes to %s\n"),
|
||||
Prog, spw_dbname ());
|
||||
SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ()));
|
||||
fail_exit (3);
|
||||
}
|
||||
|
||||
@@ -164,12 +167,14 @@ int main (int argc, char **argv)
|
||||
fprintf (stderr,
|
||||
_("%s: failure while writing changes to %s\n"),
|
||||
Prog, pw_dbname ());
|
||||
SYSLOG ((LOG_ERR, "failure while writing changes to %s", pw_dbname ()));
|
||||
fail_exit (3);
|
||||
}
|
||||
|
||||
if (unlink (SHADOW) != 0) {
|
||||
fprintf (stderr,
|
||||
_("%s: cannot delete %s\n"), Prog, SHADOW);
|
||||
SYSLOG ((LOG_ERR, "cannot delete %s", SHADOW));
|
||||
fail_exit (3);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user