* 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.

diff --git a/ChangeLog b/ChangeLog
index 12efa628055f248f04cf0cd497b701114bb997cb..df2ddd122d07b27d3c2bf57567cdcaf0cf7271e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-25  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * 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  <nicolas.francois@centraliens.net>
 
        * src/groupmems.c: Check the return value of gr_update().

diff --git a/src/chpasswd.c b/src/chpasswd.c
index d23a6c8de4be441edb4c718e5e67d34ac844870a..57b421208608569e596e42d035f5eb970053eeae 100644 (file)
--- 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 ca79d77f3af11fbb7a8890ade3d512643503470b..28d293cf47f4f6027572194c02fa0aca0cb25f86 100644 (file)
--- 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 58a98720330e99edfceb41ea9c1ac3011808af58..9608fadf74ccd823fa3ddc40017249f2af3c44cf 100644 (file)
--- 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 fcd98149b2fa49b86c42944fd5d7a1dfa2dff5ba..e3aeb56ce7b413d469d97394a0e20f2882c8a1d9 100644 (file)
--- 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);
                                }