* src/userdel.c: Avoid perror. Give more verbose warnings.

diff --git a/ChangeLog b/ChangeLog
index 25097cbbaff8a2f0db118b0d12658b3635f69674..18ffa42fe9fff92b299bc3226b723a1b52f6feb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/userdel.c: Avoid perror. Give more verbose warnings.
+
 2010-03-11  Nicolas François  <nicolas.francois@centraliens.net>
 
        * man/Makefile.am: Indicate that man/generate_mans.deps is

diff --git a/src/userdel.c b/src/userdel.c
index 9ee94aeba77e0cdc0ac80ba0d5154798adcfebfa..68fa235e6cb075328b56e49c1da28d684a113989 100644 (file)
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -758,7 +758,9 @@ static int remove_tcbdir (const char *user_name, uid_t user_id)
        }
        snprintf (buf, buflen, TCB_DIR "/%s", user_name);
        if (shadowtcb_drop_priv () == 0) {
-               perror ("shadowtcb_drop_priv");
+               fprintf (stderr, "Cannot drop privileges: %s\n",
+                        strerror (errno));
+               shadowtcb_gain_priv ();
                free (buf);
                return 1;
        }
@@ -766,7 +768,8 @@ static int remove_tcbdir (const char *user_name, uid_t user_id)
         * We will regain them and remove the user's tcb directory afterwards.
         */
        if (remove_tree (buf, false) != 0) {
-               perror ("remove_tree");
+               fprintf (stderr, "Cannot remove the content of %s: %s\n",
+                        buf, strerror (errno));
                shadowtcb_gain_priv ();
                free (buf);
                return 1;