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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-12-14 23:14:53 +0000 (Wed, 14 Dec 2005)
New Revision: 709

Modified:
   trunk/debian/patches/423_su_arguments_are_concatenated
Log:
When the non-su arguments are concatenated, do not add "-c" if the first non-su
option is already "-c".


Modified: trunk/debian/patches/423_su_arguments_are_concatenated
===================================================================
--- trunk/debian/patches/423_su_arguments_are_concatenated	2005-12-14 22:41:24 UTC (rev 708)
+++ trunk/debian/patches/423_su_arguments_are_concatenated	2005-12-14 23:14:53 UTC (rev 709)
@@ -10,9 +10,9 @@
 
 Index: shadow-4.0.14/src/su.c
 ===================================================================
---- shadow-4.0.14.orig/src/su.c	2005-12-14 22:42:12.000000000 +0100
-+++ shadow-4.0.14/src/su.c	2005-12-14 22:42:18.000000000 +0100
-@@ -876,6 +876,35 @@
+--- shadow-4.0.14.orig/src/su.c	2005-12-14 23:38:47.000000000 +0100
++++ shadow-4.0.14/src/su.c	2005-12-14 23:53:43.000000000 +0100
+@@ -880,6 +880,35 @@
  			argv[0] = "-c";
  			argv[1] = command;
  		}
@@ -24,7 +24,7 @@
 +			const char **parg;
 +			unsigned int cmd_len = 0;
 +			char *cmd = NULL;
-+			if (! command) {
++			if (strcmp(argv[0], "-c") != NULL) {
 +				argv--;
 +				argv[0] = "-c";
 +			}