diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index 0ee726637..aed4c0bc7 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -144,7 +144,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) | |||
144 | /* Execute the proxy command. Note that we gave up any | 144 | /* Execute the proxy command. Note that we gave up any |
145 | extra privileges above. */ | 145 | extra privileges above. */ |
146 | signal(SIGPIPE, SIG_DFL); | 146 | signal(SIGPIPE, SIG_DFL); |
147 | execv(argv[0], argv); | 147 | execvp(argv[0], argv); |
148 | perror(argv[0]); | 148 | perror(argv[0]); |
149 | exit(1); | 149 | exit(1); |
150 | } | 150 | } |
@@ -556,7 +556,7 @@ ssh_exchange_identification(int timeout_ms) | |||
556 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", | 556 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", |
557 | compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, | 557 | compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, |
558 | compat20 ? PROTOCOL_MINOR_2 : minor1, | 558 | compat20 ? PROTOCOL_MINOR_2 : minor1, |
559 | SSH_VERSION, compat20 ? "\r\n" : "\n"); | 559 | SSH_RELEASE, compat20 ? "\r\n" : "\n"); |
560 | if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) | 560 | if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) |
561 | != strlen(buf)) | 561 | != strlen(buf)) |
562 | fatal("write: %.100s", strerror(errno)); | 562 | fatal("write: %.100s", strerror(errno)); |
@@ -1273,7 +1273,7 @@ ssh_local_cmd(const char *args) | |||
1273 | if (pid == 0) { | 1273 | if (pid == 0) { |
1274 | signal(SIGPIPE, SIG_DFL); | 1274 | signal(SIGPIPE, SIG_DFL); |
1275 | debug3("Executing %s -c \"%s\"", shell, args); | 1275 | debug3("Executing %s -c \"%s\"", shell, args); |
1276 | execl(shell, shell, "-c", args, (char *)NULL); | 1276 | execlp(shell, shell, "-c", args, (char *)NULL); |
1277 | error("Couldn't execute %s -c \"%s\": %s", | 1277 | error("Couldn't execute %s -c \"%s\": %s", |
1278 | shell, args, strerror(errno)); | 1278 | shell, args, strerror(errno)); |
1279 | _exit(1); | 1279 | _exit(1); |