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 ec8ba33e0..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)
142 142
143 /* Execute the proxy command. Note that we gave up any 143 /* Execute the proxy command. Note that we gave up any
144 extra privileges above. */ 144 extra privileges above. */
145 execv(argv[0], argv); 145 execvp(argv[0], argv);
146 perror(argv[0]); 146 perror(argv[0]);
147 exit(1); 147 exit(1);
148 } 148 }
@@ -540,7 +540,7 @@ ssh_exchange_identification(int timeout_ms)
540 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", 540 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s",
541 compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, 541 compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,
542 compat20 ? PROTOCOL_MINOR_2 : minor1, 542 compat20 ? PROTOCOL_MINOR_2 : minor1,
543 SSH_VERSION, compat20 ? "\r\n" : "\n"); 543 SSH_RELEASE, compat20 ? "\r\n" : "\n");
544 if (atomicio(vwrite, connection_out, buf, strlen(buf)) != strlen(buf)) 544 if (atomicio(vwrite, connection_out, buf, strlen(buf)) != strlen(buf))
545 fatal("write: %.100s", strerror(errno)); 545 fatal("write: %.100s", strerror(errno));
546 client_version_string = xstrdup(buf); 546 client_version_string = xstrdup(buf);
@@ -1169,7 +1169,7 @@ ssh_local_cmd(const char *args)
1169 pid = fork(); 1169 pid = fork();
1170 if (pid == 0) { 1170 if (pid == 0) {
1171 debug3("Executing %s -c \"%s\"", shell, args); 1171 debug3("Executing %s -c \"%s\"", shell, args);
1172 execl(shell, shell, "-c", args, (char *)NULL); 1172 execlp(shell, shell, "-c", args, (char *)NULL);
1173 error("Couldn't execute %s -c \"%s\": %s", 1173 error("Couldn't execute %s -c \"%s\": %s",
1174 shell, args, strerror(errno)); 1174 shell, args, strerror(errno));
1175 _exit(1); 1175 _exit(1);