2 files changed, 9 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index e14d0f828..6e0bf132b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:5.1p1-2) UNRELEASED; urgency=low
+
+  * Look for $SHELL on the path when executing ProxyCommands or
+    LocalCommands (closes: #492728).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 29 Jul 2008 10:33:50 +0100
+
 openssh (1:5.1p1-1) unstable; urgency=low
 
   * New upstream release (closes: #474301). Important changes not previously
diff --git a/sshconnect.c b/sshconnect.c
index 01337fe40..0e3001201 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -142,7 +142,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. */
-                execv(argv[0], argv);
+                execvp(argv[0], argv);
                 perror(argv[0]);
                 exit(1);
         }
@@ -1169,7 +1169,7 @@ ssh_local_cmd(const char *args)
         pid = fork();
         if (pid == 0) {
                 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);