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

1 files changed, 2 insertions, 2 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 9e515066d..0073c6edc 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -231,7 +231,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
                 /* Execute the proxy command.  Note that we gave up any
                    extra privileges above. */
                 signal(SIGPIPE, SIG_DFL);
-                execv(argv[0], argv);
+                execvp(argv[0], argv);
                 perror(argv[0]);
                 exit(1);
         }
@@ -1470,7 +1470,7 @@ ssh_local_cmd(const char *args)
         if (pid == 0) {
                 signal(SIGPIPE, SIG_DFL);
                 debug3("Executing %s -c \"%s\"", shell, args);
-                execl(shell, shell, "-c", args, (char *)NULL);
+                execlp(shell, shell, "-c", args, (char *)NULL);
                 error("Couldn't execute %s -c \"%s\": %s",
                     shell, args, strerror(errno));
                 _exit(1);