[Pkg-shadow-commits] r3115 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-03-16 19:13:53 +0000 (Tue, 16 Mar 2010)
New Revision: 3115

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/userdel.c
Log:
	* src/userdel.c: Avoid perror. Give more verbose warnings.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-03-16 08:41:49 UTC (rev 3114)
+++ upstream/trunk/ChangeLog	2010-03-16 19:13:53 UTC (rev 3115)
@@ -1,3 +1,7 @@
+2010-03-15  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/userdel.c: Avoid perror. Give more verbose warnings.
+
 2010-03-11  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* man/Makefile.am: Indicate that man/generate_mans.deps is

Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c	2010-03-16 08:41:49 UTC (rev 3114)
+++ upstream/trunk/src/userdel.c	2010-03-16 19:13:53 UTC (rev 3115)
@@ -758,7 +758,9 @@
 	}
 	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 @@
 	 * 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;