diff options
Diffstat (limited to 'debian/patches/shell-path.patch')
-rw-r--r-- | debian/patches/shell-path.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch index a1c6efc8d..8f09b936a 100644 --- a/debian/patches/shell-path.patch +++ b/debian/patches/shell-path.patch | |||
@@ -1,16 +1,25 @@ | |||
1 | Description: Look for $SHELL on the path for ProxyCommand/LocalCommand | 1 | From b5f3be892e6d7150e7885133228fd03af69a11bc Mon Sep 17 00:00:00 2001 |
2 | There's some debate on the upstream bug about whether POSIX requires this. | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | I (Colin Watson) agree with Vincent and think it does. | 3 | Date: Sun, 9 Feb 2014 16:10:00 +0000 |
4 | Author: Colin Watson <cjwatson@debian.org> | 4 | Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand |
5 | |||
6 | There's some debate on the upstream bug about whether POSIX requires this. | ||
7 | I (Colin Watson) agree with Vincent and think it does. | ||
8 | |||
5 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494 | 9 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494 |
6 | Bug-Debian: http://bugs.debian.org/492728 | 10 | Bug-Debian: http://bugs.debian.org/492728 |
7 | Last-Update: 2013-09-14 | 11 | Last-Update: 2013-09-14 |
8 | 12 | ||
9 | Index: b/sshconnect.c | 13 | Patch-Name: shell-path.patch |
10 | =================================================================== | 14 | --- |
15 | sshconnect.c | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/sshconnect.c b/sshconnect.c | ||
19 | index 483eb85..91fd59a 100644 | ||
11 | --- a/sshconnect.c | 20 | --- a/sshconnect.c |
12 | +++ b/sshconnect.c | 21 | +++ b/sshconnect.c |
13 | @@ -151,7 +151,7 @@ | 22 | @@ -151,7 +151,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) |
14 | /* Execute the proxy command. Note that we gave up any | 23 | /* Execute the proxy command. Note that we gave up any |
15 | extra privileges above. */ | 24 | extra privileges above. */ |
16 | signal(SIGPIPE, SIG_DFL); | 25 | signal(SIGPIPE, SIG_DFL); |
@@ -19,7 +28,7 @@ Index: b/sshconnect.c | |||
19 | perror(argv[0]); | 28 | perror(argv[0]); |
20 | exit(1); | 29 | exit(1); |
21 | } | 30 | } |
22 | @@ -1298,7 +1298,7 @@ | 31 | @@ -1298,7 +1298,7 @@ ssh_local_cmd(const char *args) |
23 | if (pid == 0) { | 32 | if (pid == 0) { |
24 | signal(SIGPIPE, SIG_DFL); | 33 | signal(SIGPIPE, SIG_DFL); |
25 | debug3("Executing %s -c \"%s\"", shell, args); | 34 | debug3("Executing %s -c \"%s\"", shell, args); |