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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-06-29 20:34:54 +0000 (Wed, 29 Jun 2005)
New Revision: 320

Added:
   trunk/debian/patches/358_userdel_remove_group_from_gshadow
   trunk/debian/patches/359_usermod_warn_old_home_not_removed
Removed:
   trunk/debian/patches/008_userdel_remove_group_from_gshadow
   trunk/debian/patches/008_usermod_warn_old_home_not_removed
Modified:
   trunk/debian/patches/series
Log:
These patches (008_userdel_remove_group_from_gshadow and
358_userdel_remove_group_from_gshadow) are already applied upstream
(4.0.10)


Deleted: trunk/debian/patches/008_userdel_remove_group_from_gshadow
===================================================================
--- trunk/debian/patches/008_userdel_remove_group_from_gshadow	2005-06-29 20:29:04 UTC (rev 319)
+++ trunk/debian/patches/008_userdel_remove_group_from_gshadow	2005-06-29 20:34:54 UTC (rev 320)
@@ -1,40 +0,0 @@
-Goal: userdel now deletes user groups from /etc/gshdow as well as
-      /etc/group.
-Fixes: #99442
-
-Status wrt upstream: It could certainly be submitted to upstream.
-
-Index: shadow-4.0.3/src/userdel.c
-===================================================================
---- shadow-4.0.3.orig/src/userdel.c	2005-05-22 22:41:28.837167000 +0200
-+++ shadow-4.0.3/src/userdel.c	2005-05-22 23:02:35.137167000 +0200
-@@ -147,6 +147,7 @@
- 	struct group *ngrp;
- 
- #ifdef	SHADOWGRP
-+	int deleted_user_group = 0;
- 	const struct sgrp *sgrp;
- 	struct sgrp *nsgrp;
- #endif				/* SHADOWGRP */
-@@ -209,6 +210,10 @@
- 
- 		gr_remove (grp->gr_name);
- 
-+#ifdef SHADOWGRP
-+		deleted_user_group = 1;
-+#endif
-+
- 		/*
- 		 * Update the DBM group file with the new entry as well.
- 		 */
-@@ -279,6 +284,10 @@
- 		SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'\n",
- 			 user_name, nsgrp->sg_name));
- 	}
-+
-+	if (deleted_user_group)
-+		sgr_remove(user_name);
-+
- #ifdef	NDBM
- 	endsgent ();
- #endif				/* NDBM */

Deleted: trunk/debian/patches/008_usermod_warn_old_home_not_removed
===================================================================
--- trunk/debian/patches/008_usermod_warn_old_home_not_removed	2005-06-29 20:29:04 UTC (rev 319)
+++ trunk/debian/patches/008_usermod_warn_old_home_not_removed	2005-06-29 20:34:54 UTC (rev 320)
@@ -1,30 +0,0 @@
-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);

Copied: trunk/debian/patches/358_userdel_remove_group_from_gshadow (from rev 310, trunk/debian/patches/008_userdel_remove_group_from_gshadow)

Copied: trunk/debian/patches/359_usermod_warn_old_home_not_removed (from rev 310, trunk/debian/patches/008_usermod_warn_old_home_not_removed)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-29 20:29:04 UTC (rev 319)
+++ trunk/debian/patches/series	2005-06-29 20:34:54 UTC (rev 320)
@@ -41,8 +41,8 @@
 355_login_close_session_as_root
 347_login_log_pam_user_if_USE_PAM
 348_login_PAM_SILENT_if_hushed_login
-008_usermod_warn_old_home_not_removed
-008_userdel_remove_group_from_gshadow
+359_usermod_warn_old_home_not_removed
+358_userdel_remove_group_from_gshadow
 008_newgrp_preserve_env
 008_su_GNU_origin
 # 009 is patching login.defs file we don't use, actually..:-)