[Pkg-shadow-commits] r2667 - in debian/trunk/debian: . patches

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-12 00:36:24 +0000 (Sun, 12 Apr 2009)
New Revision: 2667

Removed:
   debian/trunk/debian/patches/431_su_uid_0_not_root
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
Removed debian/patches/431_su_uid_0_not_root (applied upstream).


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2009-04-12 00:28:32 UTC (rev 2666)
+++ debian/trunk/debian/changelog	2009-04-12 00:36:24 UTC (rev 2667)
@@ -17,6 +17,7 @@
       + debian/patches/300_SHA_crypt_method
       + debian/patches/301_manpages_missing_options
       + debian/patches/415_login_put-echoctl-back
+      + debian/patches/431_su_uid_0_not_root
     - Remove patches applied upstream (4.1.3):
       + debian/patches/200_Czech_binary_translation
       + debian/patches/302_remove_non_translated_polish_manpages

Deleted: debian/trunk/debian/patches/431_su_uid_0_not_root
===================================================================
--- debian/trunk/debian/patches/431_su_uid_0_not_root	2009-04-12 00:28:32 UTC (rev 2666)
+++ debian/trunk/debian/patches/431_su_uid_0_not_root	2009-04-12 00:36:24 UTC (rev 2667)
@@ -1,26 +0,0 @@
-Goal: don't assume uid 0 == "root", use getpwuid to fetch it
-Fixes: #81924
-
-Status wrt upstream: It was submitted upstream upstream (3 Jun 2005).
-                     Some modification may be needed before its inclusion
-                     upstream (multiple uid 0 accounts).
-http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2005-June/001287.html
-
-Index: shadow-4.1.0/src/su.c
-===================================================================
---- shadow-4.1.0.orig/src/su.c
-+++ shadow-4.1.0/src/su.c
-@@ -449,7 +449,12 @@
- 			optind++;
- 	}
- 	if ('\0' == name[0]) {		/* use default user ID */
--		(void) strcpy (name, "root");
-+		struct passwd *root_pw = getpwuid(0);
-+		if (root_pw == NULL) {
-+			SYSLOG((LOG_CRIT, "There is no UID 0 user."));
-+			su_failure(tty);
-+		}
-+		strcpy(name, root_pw->pw_name);
- 	}
- 
- 	doshell = argc == optind;	/* any arguments remaining? */

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2009-04-12 00:28:32 UTC (rev 2666)
+++ debian/trunk/debian/patches/series	2009-04-12 00:36:24 UTC (rev 2667)
@@ -3,7 +3,6 @@
 #901_testsuite_gcov
 
 503_shadowconfig.8
-431_su_uid_0_not_root
 008_su_no_sanitize_env
 008_su_get_PAM_username
 428_grpck_add_prune_option