summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-09 16:10:00 +0000
committerColin Watson <cjwatson@debian.org>2016-12-23 11:25:03 +0000
commitf6973171005fc513fa25540a1561ca1128e488e1 (patch)
tree4cae94f063d433dae51537fc05238fbc5350af42
parent43205c71be413d2225ce3ea5cf81d79afd420b81 (diff)
Look for $SHELL on the path for ProxyCommand/LocalCommand
There's some debate on the upstream bug about whether POSIX requires this. I (Colin Watson) agree with Vincent and think it does. Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494 Bug-Debian: http://bugs.debian.org/492728 Last-Update: 2013-09-14 Patch-Name: shell-path.patch
-rw-r--r--sshconnect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 96b91ce1a..698a07114 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -231,7 +231,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
231 /* Execute the proxy command. Note that we gave up any 231 /* Execute the proxy command. Note that we gave up any
232 extra privileges above. */ 232 extra privileges above. */
233 signal(SIGPIPE, SIG_DFL); 233 signal(SIGPIPE, SIG_DFL);
234 execv(argv[0], argv); 234 execvp(argv[0], argv);
235 perror(argv[0]); 235 perror(argv[0]);
236 exit(1); 236 exit(1);
237 } 237 }
@@ -1498,7 +1498,7 @@ ssh_local_cmd(const char *args)
1498 if (pid == 0) { 1498 if (pid == 0) {
1499 signal(SIGPIPE, SIG_DFL); 1499 signal(SIGPIPE, SIG_DFL);
1500 debug3("Executing %s -c \"%s\"", shell, args); 1500 debug3("Executing %s -c \"%s\"", shell, args);
1501 execl(shell, shell, "-c", args, (char *)NULL); 1501 execlp(shell, shell, "-c", args, (char *)NULL);
1502 error("Couldn't execute %s -c \"%s\": %s", 1502 error("Couldn't execute %s -c \"%s\": %s",
1503 shell, args, strerror(errno)); 1503 shell, args, strerror(errno));
1504 _exit(1); 1504 _exit(1);