From aa2fee49690d384ca75603687916f07141741e02 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 30 Aug 2008 18:27:59 +0000 Subject: [PATCH] * src/useradd.c: Harmonize some error messages. * src/userdel.c: Add log to syslog when the mail file could not be removed. * src/userdel.c: Give more context an error message (merge with perror()). * src/usermod.c: Harmonize some error messages. --- ChangeLog | 9 +++++++++ src/chpasswd.c | 10 +++++----- src/useradd.c | 7 +++---- src/userdel.c | 9 ++++++--- src/usermod.c | 6 +++--- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12efa628..df2ddd12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-25 Nicolas François + + * src/useradd.c: Harmonize some error messages. + * src/userdel.c: Add log to syslog when the mail file could not be + removed. + * src/userdel.c: Give more context an error message (merge with + perror()). + * src/usermod.c: Harmonize some error messages. + 2008-08-25 Nicolas François * src/groupmems.c: Check the return value of gr_update(). diff --git a/src/chpasswd.c b/src/chpasswd.c index d23a6c8d..57b42120 100644 --- a/src/chpasswd.c +++ b/src/chpasswd.c @@ -481,16 +481,16 @@ int main (int argc, char **argv) if (NULL != sp) { if (spw_update (&newsp) == 0) { fprintf (stderr, - _("%s: line %d: failed to prepare the new %s entry\n"), - Prog, line, spw_dbname ()); + _("%s: line %d: failed to prepare the new %s entry '%s'\n"), + Prog, line, spw_dbname (), newsp.sp_namp); errors++; continue; } } else { - if (pw_update (&newsp) == 0) { + if (pw_update (&newpw) == 0) { fprintf (stderr, - _("%s: line %d: failed to prepare the new %s entry\n"), - Prog, line, pw_dbname ()); + _("%s: line %d: failed to prepare the new %s entry '%s'\n"), + Prog, line, pw_dbname (), newpw.pw_name); errors++; continue; } diff --git a/src/useradd.c b/src/useradd.c index ca79d77f..28d293cf 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -832,8 +832,8 @@ static void grp_update (void) ngrp = __gr_dup (grp); if (NULL == ngrp) { fprintf (stderr, - _("%s: Out of memory. Cannot update the group database.\n"), - Prog); + _("%s: Out of memory. Cannot update %s.\n"), + Prog, gr_dbname ()); fail_exit (E_GRP_UPDATE); /* XXX */ } @@ -1041,8 +1041,7 @@ static void process_flags (int argc, char **argv) grp = getgr_nam_gid (optarg); if (NULL == grp) { fprintf (stderr, - _ - ("%s: unknown group %s\n"), + _("%s: group '%s' does not exist\n"), Prog, optarg); exit (E_NOTFOUND); } diff --git a/src/userdel.c b/src/userdel.c index 58a98720..9608fadf 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -708,17 +708,20 @@ static void remove_mailbox (void) fprintf (stderr, _("%s: %s not owned by %s, not removing\n"), Prog, mailfile, user_name); + SYSLOG ((LOG_ERR, "%s not owned by %s, not removed", mailfile, strerror (errno))); #ifdef WITH_AUDIT audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file", user_name, (unsigned int) user_id, 0); #endif return; - } else if (i == -1) + } else if (i == -1) { return; /* mailbox doesn't exist */ + } if (unlink (mailfile) != 0) { - fprintf (stderr, _("%s: warning: can't remove "), Prog); - perror (mailfile); + fprintf (stderr, _("%s: warning: can't remove %s: %s"), Prog, mailfile, strerror (errno)); + SYSLOG ((LOG_ERR, "Cannot remove %s: %s", mailfile, strerror (errno))); + /* continue */ } #ifdef WITH_AUDIT else { diff --git a/src/usermod.c b/src/usermod.c index fcd98149..e3aeb56c 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -250,8 +250,8 @@ static int get_groups (char *list) * string name. */ if (NULL == grp) { - fprintf (stderr, _("%s: unknown group %s\n"), - Prog, list); + fprintf (stderr, _("%s: group '%s' does not exist\n"), + Prog, list); errors++; } list = cp; @@ -954,7 +954,7 @@ static void process_flags (int argc, char **argv) grp = getgr_nam_gid (optarg); if (NULL == grp) { fprintf (stderr, - _("%s: unknown group %s\n"), + _("%s: group '%s' does not exist\n"), Prog, optarg); exit (E_NOTFOUND); }