39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From aff1a94c2716097f669efd7d59b257f50232c01e Mon Sep 17 00:00:00 2001
|
|
From: Colin Watson <cjwatson@debian.org>
|
|
Date: Sun, 9 Feb 2014 16:10:00 +0000
|
|
Subject: 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: 2020-02-21
|
|
|
|
Patch-Name: shell-path.patch
|
|
---
|
|
sshconnect.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sshconnect.c b/sshconnect.c
|
|
index c86182d13..43b75dcf7 100644
|
|
--- a/sshconnect.c
|
|
+++ b/sshconnect.c
|
|
@@ -248,7 +248,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
|
|
* extra privileges above.
|
|
*/
|
|
ssh_signal(SIGPIPE, SIG_DFL);
|
|
- execv(argv[0], argv);
|
|
+ execvp(argv[0], argv);
|
|
perror(argv[0]);
|
|
exit(1);
|
|
}
|
|
@@ -1711,7 +1711,7 @@ ssh_local_cmd(const char *args)
|
|
if (pid == 0) {
|
|
ssh_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);
|