Merge 3.9p1 to the trunk.

1 files changed, 6 insertions, 7 deletions

diff --git a/sshconnect.c b/sshconnect.c
index e0d1a8c7e..5158416f0 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.158 2004/06/21 17:36:31 avsm Exp $");
 
 #include <openssl/bn.h>
 
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
 #include "readconf.h"
 #include "atomicio.h"
 #include "misc.h"
-#include "readpass.h"
 
 #include "dns.h"
 
@@ -800,19 +799,19 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                 break;
         case HOST_CHANGED:
                 if (options.check_host_ip && host_ip_differ) {
-                        char *msg;
+                        char *key_msg;
                         if (ip_status == HOST_NEW)
-                                msg = "is unknown";
+                                key_msg = "is unknown";
                         else if (ip_status == HOST_OK)
-                                msg = "is unchanged";
+                                key_msg = "is unchanged";
                         else
-                                msg = "has a different value";
+                                key_msg = "has a different value";
                         error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
                         error("@       WARNING: POSSIBLE DNS SPOOFING DETECTED!          @");
                         error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
                         error("The %s host key for %s has changed,", type, host);
                         error("and the key for the according IP address %s", ip);
-                        error("%s. This could either mean that", msg);
+                        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)