1 files changed, 10 insertions, 5 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 483eb85ac..ad960fdbf 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -151,7 +151,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
                 /* Execute the proxy command.  Note that we gave up any
                    extra privileges above. */
                 signal(SIGPIPE, SIG_DFL);
-                execv(argv[0], argv);
+                execvp(argv[0], argv);
                 perror(argv[0]);
                 exit(1);
         }
@@ -442,10 +442,10 @@ send_client_banner(int connection_out, int minor1)
         /* Send our own protocol version identification. */
         if (compat20) {
                 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
-                    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+                    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
         } else {
                 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
-                    PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
+                    PROTOCOL_MAJOR_1, minor1, SSH_RELEASE);
         }
         if (roaming_atomicio(vwrite, connection_out, client_version_string,
             strlen(client_version_string)) != strlen(client_version_string))
@@ -981,9 +981,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                         error("%s. This could either mean that", key_msg);
                         error("DNS SPOOFING is happening or the IP address for the host");
                         error("and its host key have changed at the same time.");
-                        if (ip_status != HOST_NEW)
+                        if (ip_status != HOST_NEW) {
                                 error("Offending key for IP in %s:%lu",
                                     ip_found->file, ip_found->line);
+                                error("  remove with: ssh-keygen -f \"%s\" -R %s",
+                                    ip_found->file, ip);
+                        }
                 }
                 /* The host key has changed. */
                 warn_changed_key(host_key);
@@ -991,6 +994,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                     user_hostfiles[0]);
                 error("Offending %s key in %s:%lu", key_type(host_found->key),
                     host_found->file, host_found->line);
+                error("  remove with: ssh-keygen -f \"%s\" -R %s",
+                    host_found->file, host);
 
                 /*
                  * If strict host key checking is in use, the user will have
@@ -1298,7 +1303,7 @@ ssh_local_cmd(const char *args)
         if (pid == 0) {
                 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);