From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Tue, 16 Mar 2010 19:13:53 +0000 (+0000)
Subject: 	* src/userdel.c: Avoid perror. Give more verbose warnings.
X-Git-Tag: 4.1.5~344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c4e2931efa8a05f750e1d8b2bddbf40b11d52ec;p=shadow

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

diff --git a/ChangeLog b/ChangeLog
index 25097cbb..18ffa42f 100644
--- 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 9ee94aeb..68fa235e 100644
--- 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;