summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 9de52224d..b6fea4d7e 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -141,7 +141,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
141 141
142 /* Execute the proxy command. Note that we gave up any 142 /* Execute the proxy command. Note that we gave up any
143 extra privileges above. */ 143 extra privileges above. */
144 execv(argv[0], argv); 144 execvp(argv[0], argv);
145 perror(argv[0]); 145 perror(argv[0]);
146 exit(1); 146 exit(1);
147 } 147 }
@@ -542,7 +542,7 @@ ssh_exchange_identification(int timeout_ms)
542 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", 542 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s",
543 compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, 543 compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,
544 compat20 ? PROTOCOL_MINOR_2 : minor1, 544 compat20 ? PROTOCOL_MINOR_2 : minor1,
545 SSH_VERSION, compat20 ? "\r\n" : "\n"); 545 SSH_RELEASE, compat20 ? "\r\n" : "\n");
546 if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) 546 if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf))
547 != strlen(buf)) 547 != strlen(buf))
548 fatal("write: %.100s", strerror(errno)); 548 fatal("write: %.100s", strerror(errno));
@@ -1243,7 +1243,7 @@ ssh_local_cmd(const char *args)
1243 pid = fork(); 1243 pid = fork();
1244 if (pid == 0) { 1244 if (pid == 0) {
1245 debug3("Executing %s -c \"%s\"", shell, args); 1245 debug3("Executing %s -c \"%s\"", shell, args);
1246 execl(shell, shell, "-c", args, (char *)NULL); 1246 execlp(shell, shell, "-c", args, (char *)NULL);
1247 error("Couldn't execute %s -c \"%s\": %s", 1247 error("Couldn't execute %s -c \"%s\": %s",
1248 shell, args, strerror(errno)); 1248 shell, args, strerror(errno));
1249 _exit(1); 1249 _exit(1);