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 c04aa1057..e7354486b 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -138,7 +138,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) | |||
138 | 138 | ||
139 | /* Execute the proxy command. Note that we gave up any | 139 | /* Execute the proxy command. Note that we gave up any |
140 | extra privileges above. */ | 140 | extra privileges above. */ |
141 | execv(argv[0], argv); | 141 | execvp(argv[0], argv); |
142 | perror(argv[0]); | 142 | perror(argv[0]); |
143 | exit(1); | 143 | exit(1); |
144 | } | 144 | } |
@@ -536,7 +536,7 @@ ssh_exchange_identification(int timeout_ms) | |||
536 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", | 536 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", |
537 | compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, | 537 | compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, |
538 | compat20 ? PROTOCOL_MINOR_2 : minor1, | 538 | compat20 ? PROTOCOL_MINOR_2 : minor1, |
539 | SSH_VERSION, compat20 ? "\r\n" : "\n"); | 539 | SSH_RELEASE, compat20 ? "\r\n" : "\n"); |
540 | if (atomicio(vwrite, connection_out, buf, strlen(buf)) != strlen(buf)) | 540 | if (atomicio(vwrite, connection_out, buf, strlen(buf)) != strlen(buf)) |
541 | fatal("write: %.100s", strerror(errno)); | 541 | fatal("write: %.100s", strerror(errno)); |
542 | client_version_string = xstrdup(buf); | 542 | client_version_string = xstrdup(buf); |
@@ -1165,7 +1165,7 @@ ssh_local_cmd(const char *args) | |||
1165 | pid = fork(); | 1165 | pid = fork(); |
1166 | if (pid == 0) { | 1166 | if (pid == 0) { |
1167 | debug3("Executing %s -c \"%s\"", shell, args); | 1167 | debug3("Executing %s -c \"%s\"", shell, args); |
1168 | execl(shell, shell, "-c", args, (char *)NULL); | 1168 | execlp(shell, shell, "-c", args, (char *)NULL); |
1169 | error("Couldn't execute %s -c \"%s\": %s", | 1169 | error("Couldn't execute %s -c \"%s\": %s", |
1170 | shell, args, strerror(errno)); | 1170 | shell, args, strerror(errno)); |
1171 | _exit(1); | 1171 | _exit(1); |