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

[Christian Perrier]

Author: bubulle
Date: 2006-01-03 07:18:35 +0000 (Tue, 03 Jan 2006)
New Revision: 752

Removed:
   trunk/debian/patches/475_su_use_amroot_instead_of_getuid
Modified:
   trunk/debian/patches/series
Log:
Patch has been applied upstream

Deleted: trunk/debian/patches/475_su_use_amroot_instead_of_getuid
===================================================================
--- trunk/debian/patches/475_su_use_amroot_instead_of_getuid	2006-01-03 07:14:34 UTC (rev 751)
+++ trunk/debian/patches/475_su_use_amroot_instead_of_getuid	2006-01-03 07:18:35 UTC (rev 752)
@@ -1,13 +0,0 @@
-Index: shadow-4.0.14/src/su.c
-===================================================================
---- shadow-4.0.14.orig/src/su.c	2005-12-14 22:31:30.000000000 +0100
-+++ shadow-4.0.14/src/su.c	2005-12-14 22:34:06.000000000 +0100
-@@ -608,7 +608,7 @@
- 	/* For users with non null UID, if this user has a restricted
- 	 * shell, the shell must be the one specified in /etc/passwd
- 	 */
--	if (shellstr != NULL && getuid () && restricted_shell (pwent.pw_shell))
-+	if (shellstr != NULL && !amroot && restricted_shell (pwent.pw_shell))
- 		shellstr = NULL;
- 	/* If the shell is not set at this time, use the shell specified
- 	 * in /etc/passwd.

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-01-03 07:14:34 UTC (rev 751)
+++ trunk/debian/patches/series	2006-01-03 07:18:35 UTC (rev 752)
@@ -41,7 +41,6 @@
 468_duplicate_passwd_struct_before_usage
 502_fix_generated_man_pages
 470_su.1_document_options
-475_su_use_amroot_instead_of_getuid
 476_su_ignore_--
 437_su_-c_option
 423_su_arguments_are_concatenated