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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-12-14 22:41:24 +0000 (Wed, 14 Dec 2005)
New Revision: 708

Added:
   trunk/debian/patches/476_su_ignore_--
Modified:
   trunk/debian/patches/series
Log:
-- must be ignored. Otherwise,
"su -- - user" or "su - -- user" won't work


Added: trunk/debian/patches/476_su_ignore_--
===================================================================
--- trunk/debian/patches/476_su_ignore_--	2005-12-14 22:19:04 UTC (rev 707)
+++ trunk/debian/patches/476_su_ignore_--	2005-12-14 22:41:24 UTC (rev 708)
@@ -0,0 +1,22 @@
+Index: shadow-4.0.14/src/su.c
+===================================================================
+--- shadow-4.0.14.orig/src/su.c	2005-12-14 23:32:01.000000000 +0100
++++ shadow-4.0.14/src/su.c	2005-12-14 23:36:04.000000000 +0100
+@@ -393,6 +393,8 @@
+ 		if (optind < argc && !strcmp (argv[optind], "-")) {
+ 			fakelogin = 1;
+ 			optind++;
++			if (!strcmp(argv[optind], "--"))
++				optind++;
+ 		}
+ 	}
+ 
+@@ -433,6 +435,8 @@
+ 	 */
+ 	if (optind < argc && argv[optind][0] != '-') {
+ 		STRFCPY (name, argv[optind++]);	/* use this login id */
++		if (!strcmp(argv[optind], "--"))
++			optind++;
+ 	}
+ 	if (!name[0])		/* use default user ID */
+ 	{

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-12-14 22:19:04 UTC (rev 707)
+++ trunk/debian/patches/series	2005-12-14 22:41:24 UTC (rev 708)
@@ -49,6 +49,7 @@
 473_su_fix_comments
 474_useradd_fix_comments
 475_su_use_amroot_instead_of_getuid
+476_su_ignore_--
 437_su_-c_option
 423_su_arguments_are_concatenated
 # 999-2 is about using cdbs. It does not patch upstream files