[Pkg-shadow-commits] r169 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-05-22 23:32:27 +0000 (Sun, 22 May 2005)
New Revision: 169

Added:
   trunk/debian/patches/008_usermod_warn_old_home_not_removed
Modified:
   trunk/debian/patches/008_src.dpatch
   trunk/debian/patches/series
Log:
Move some bits from 008_src.dpatch to 008_usermod_warn_old_home_not_removed


Modified: trunk/debian/patches/008_src.dpatch
===================================================================
--- trunk/debian/patches/008_src.dpatch	2005-05-22 23:29:18 UTC (rev 168)
+++ trunk/debian/patches/008_src.dpatch	2005-05-22 23:32:27 UTC (rev 169)
@@ -855,25 +855,3 @@
  #ifdef	NDBM
  	endsgent ();
  #endif				/* NDBM */
-Index: shadow-4.0.3/src/usermod.c
-===================================================================
---- shadow-4.0.3.orig/src/usermod.c	2005-05-23 00:40:16.187167000 +0200
-+++ shadow-4.0.3/src/usermod.c	2005-05-23 00:40:50.317167000 +0200
-@@ -1544,9 +1544,14 @@
- 				if (copy_tree (user_home, user_newhome,
- 					       uflg ? user_newid : -1,
- 					       gflg ? user_newgid : -1) ==
--				    0 && remove_tree (user_home) == 0
--				    && rmdir (user_home) == 0)
--					return;
-+				    0) {
-+				  if (remove_tree (user_home) != 0 ||
-+				    rmdir (user_home) != 0)
-+				    fprintf (stderr,
-+					     _("%s: warning: failed to completely remove old home directory %s"),
-+					     Prog, user_home);
-+				  return;
-+				}
- 
- 				(void) remove_tree (user_newhome);
- 				(void) rmdir (user_newhome);

Added: trunk/debian/patches/008_usermod_warn_old_home_not_removed
===================================================================
--- trunk/debian/patches/008_usermod_warn_old_home_not_removed	2005-05-22 23:29:18 UTC (rev 168)
+++ trunk/debian/patches/008_usermod_warn_old_home_not_removed	2005-05-22 23:32:27 UTC (rev 169)
@@ -0,0 +1,30 @@
+Goal: When relocating a user's home directory, don't fail and remove the new
+      home directory if we can't remove the old home directory for some
+      reason; the results can be spectularly poort if, for instance, only
+      the rmdir() fails.
+Fixes: #166369
+
+Status wrt upstream: It could certainly be submitted to upstream.
+
+Index: shadow-4.0.3/src/usermod.c
+===================================================================
+--- shadow-4.0.3.orig/src/usermod.c	2005-05-22 21:23:35.637167000 +0200
++++ shadow-4.0.3/src/usermod.c	2005-05-22 21:48:12.207167000 +0200
+@@ -1544,9 +1544,14 @@
+ 				if (copy_tree (user_home, user_newhome,
+ 					       uflg ? user_newid : -1,
+ 					       gflg ? user_newgid : -1) ==
+-				    0 && remove_tree (user_home) == 0
+-				    && rmdir (user_home) == 0)
+-					return;
++				    0) {
++				  if (remove_tree (user_home) != 0 ||
++				    rmdir (user_home) != 0)
++				    fprintf (stderr,
++					     _("%s: warning: failed to completely remove old home directory %s"),
++					     Prog, user_home);
++				  return;
++				}
+ 
+ 				(void) remove_tree (user_newhome);
+ 				(void) rmdir (user_newhome);

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-05-22 23:29:18 UTC (rev 168)
+++ trunk/debian/patches/series	2005-05-22 23:32:27 UTC (rev 169)
@@ -8,6 +8,7 @@
 008_grpck_add_prune_option
 008_login_stop_checking_args_after--
 008_login_opt-f_with_username_after--
+008_usermod_warn_old_home_not_removed
 009_etc.dpatch
 010_chpasswd-md5.dpatch
 100_LINGUAS.dpatch