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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:04:57 +0000 (Sat, 13 Sep 2008)
New Revision: 2375

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/431_su_uid_0_not_root
Log:
Updated for upstream version 4.1.2.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:02:03 UTC (rev 2374)
+++ debian/trunk/debian/changelog	2008-09-13 17:04:57 UTC (rev 2375)
@@ -1,6 +1,9 @@
 shadow (1:4.1.2-1) experimental; urgency=low
 
   * The "" release.
+  * New upstream release:
+    - Updated patches:
+      + debian/patches/431_su_uid_0_not_root
   * debian/control: changed the "Replaces" on manpages-zh to a versioned
     one on 1.5.1-1
   * debian/control: drop all Replaces on manpages-* when the version is

Modified: debian/trunk/debian/patches/431_su_uid_0_not_root
===================================================================
--- debian/trunk/debian/patches/431_su_uid_0_not_root	2008-09-13 17:02:03 UTC (rev 2374)
+++ debian/trunk/debian/patches/431_su_uid_0_not_root	2008-09-13 17:04:57 UTC (rev 2375)
@@ -10,19 +10,17 @@
 ===================================================================
 --- shadow-4.1.0.orig/src/su.c
 +++ shadow-4.1.0/src/su.c
-@@ -449,7 +449,14 @@
+@@ -449,7 +449,12 @@
  			optind++;
  	}
- 	if (!name[0])		/* use default user ID */
+ 	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? */
- 	if (command)