diff options
author | Serge Hallyn <serge.hallyn@ubuntu.com> | 2016-09-18 22:14:43 -0500 |
---|---|---|
committer | Serge Hallyn <serge@hallyn.com> | 2016-10-13 10:19:55 -0500 |
commit | d9e428fd63e49486c8fb0f2e03df7a5608b0b0e2 (patch) | |
tree | c42692274474b7a037c9c2ea24b793c2540c6a83 /debian/patches/523_su_arguments_are_no_more_concatenated_by_default | |
parent | 68cd195044deb448c865d267499e1e4fd9322057 (diff) | |
parent | 3fcf082618704e4361653a2112cec97b8252a53e (diff) | |
download | shadow-2016-10-13/d1.tar.gz |
Imported Debian patch 1:4.4-12016-10-13/d1
Diffstat (limited to 'debian/patches/523_su_arguments_are_no_more_concatenated_by_default')
-rw-r--r-- | debian/patches/523_su_arguments_are_no_more_concatenated_by_default | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/523_su_arguments_are_no_more_concatenated_by_default b/debian/patches/523_su_arguments_are_no_more_concatenated_by_default index e148d8d9..86a6a06d 100644 --- a/debian/patches/523_su_arguments_are_no_more_concatenated_by_default +++ b/debian/patches/523_su_arguments_are_no_more_concatenated_by_default @@ -8,11 +8,11 @@ Etch. Status wrt upstream: This patch is Debian specific. -Index: git/src/su.c +Index: shadow-4.4/src/su.c =================================================================== ---- git.orig/src/su.c -+++ git/src/su.c -@@ -104,6 +104,19 @@ +--- shadow-4.4.orig/src/su.c ++++ shadow-4.4/src/su.c +@@ -104,6 +104,19 @@ static char caller_name[BUFSIZ]; /* If nonzero, change some environment vars to indicate the user su'd to. */ static bool change_environment = true; @@ -30,9 +30,9 @@ Index: git/src/su.c +static int old_debian_behavior; + #ifdef USE_PAM - static pam_handle_t *pamh = NULL; - static int caught = 0; -@@ -949,6 +962,8 @@ + static char kill_msg[256]; + static char wait_msg[256]; +@@ -952,6 +965,8 @@ int main (int argc, char **argv) int ret; #endif /* USE_PAM */ @@ -41,7 +41,7 @@ Index: git/src/su.c (void) setlocale (LC_ALL, ""); (void) bindtextdomain (PACKAGE, LOCALEDIR); (void) textdomain (PACKAGE); -@@ -1156,7 +1171,7 @@ +@@ -1159,7 +1174,7 @@ int main (int argc, char **argv) * resulting string is always given to the shell with its * -c option. */ |