diff options
Diffstat (limited to 'debian/patches/shell-path.patch')
-rw-r--r-- | debian/patches/shell-path.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch index d7f69011e..43fb1d145 100644 --- a/debian/patches/shell-path.patch +++ b/debian/patches/shell-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5d1aab0eb6baeb044516660a0bde36cba2a3f9c2 Mon Sep 17 00:00:00 2001 | 1 | From c19bcc02b07b450d585d0fd10ccd96174aeb3b7c Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:00 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:00 +0000 |
4 | Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand | 4 | Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand |
@@ -8,7 +8,7 @@ I (Colin Watson) agree with Vincent and think it does. | |||
8 | 8 | ||
9 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494 | 9 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494 |
10 | Bug-Debian: http://bugs.debian.org/492728 | 10 | Bug-Debian: http://bugs.debian.org/492728 |
11 | Last-Update: 2013-09-14 | 11 | Last-Update: 2020-02-21 |
12 | 12 | ||
13 | Patch-Name: shell-path.patch | 13 | Patch-Name: shell-path.patch |
14 | --- | 14 | --- |
@@ -16,21 +16,21 @@ Patch-Name: shell-path.patch | |||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/sshconnect.c b/sshconnect.c | 18 | diff --git a/sshconnect.c b/sshconnect.c |
19 | index 6230dad32..644057bc4 100644 | 19 | index 4711af782..4a5d4a003 100644 |
20 | --- a/sshconnect.c | 20 | --- a/sshconnect.c |
21 | +++ b/sshconnect.c | 21 | +++ b/sshconnect.c |
22 | @@ -260,7 +260,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg, | 22 | @@ -260,7 +260,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg, |
23 | /* Execute the proxy command. Note that we gave up any | 23 | /* Execute the proxy command. Note that we gave up any |
24 | extra privileges above. */ | 24 | extra privileges above. */ |
25 | signal(SIGPIPE, SIG_DFL); | 25 | ssh_signal(SIGPIPE, SIG_DFL); |
26 | - execv(argv[0], argv); | 26 | - execv(argv[0], argv); |
27 | + execvp(argv[0], argv); | 27 | + execvp(argv[0], argv); |
28 | perror(argv[0]); | 28 | perror(argv[0]); |
29 | exit(1); | 29 | exit(1); |
30 | } | 30 | } |
31 | @@ -1387,7 +1387,7 @@ ssh_local_cmd(const char *args) | 31 | @@ -1388,7 +1388,7 @@ ssh_local_cmd(const char *args) |
32 | if (pid == 0) { | 32 | if (pid == 0) { |
33 | signal(SIGPIPE, SIG_DFL); | 33 | ssh_signal(SIGPIPE, SIG_DFL); |
34 | debug3("Executing %s -c \"%s\"", shell, args); | 34 | debug3("Executing %s -c \"%s\"", shell, args); |
35 | - execl(shell, shell, "-c", args, (char *)NULL); | 35 | - execl(shell, shell, "-c", args, (char *)NULL); |
36 | + execlp(shell, shell, "-c", args, (char *)NULL); | 36 | + execlp(shell, shell, "-c", args, (char *)NULL); |