diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sshconnect.c b/sshconnect.c index dfeddd39e..11008e544 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.158 2004/06/21 17:36:31 avsm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $"); | |||
31 | #include "readconf.h" | 31 | #include "readconf.h" |
32 | #include "atomicio.h" | 32 | #include "atomicio.h" |
33 | #include "misc.h" | 33 | #include "misc.h" |
34 | #include "readpass.h" | ||
35 | 34 | ||
36 | #include "dns.h" | 35 | #include "dns.h" |
37 | 36 | ||
@@ -768,19 +767,19 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
768 | break; | 767 | break; |
769 | case HOST_CHANGED: | 768 | case HOST_CHANGED: |
770 | if (options.check_host_ip && host_ip_differ) { | 769 | if (options.check_host_ip && host_ip_differ) { |
771 | char *msg; | 770 | char *key_msg; |
772 | if (ip_status == HOST_NEW) | 771 | if (ip_status == HOST_NEW) |
773 | msg = "is unknown"; | 772 | key_msg = "is unknown"; |
774 | else if (ip_status == HOST_OK) | 773 | else if (ip_status == HOST_OK) |
775 | msg = "is unchanged"; | 774 | key_msg = "is unchanged"; |
776 | else | 775 | else |
777 | msg = "has a different value"; | 776 | key_msg = "has a different value"; |
778 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 777 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
779 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); | 778 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); |
780 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 779 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
781 | error("The %s host key for %s has changed,", type, host); | 780 | error("The %s host key for %s has changed,", type, host); |
782 | error("and the key for the according IP address %s", ip); | 781 | error("and the key for the according IP address %s", ip); |
783 | error("%s. This could either mean that", msg); | 782 | error("%s. This could either mean that", key_msg); |
784 | error("DNS SPOOFING is happening or the IP address for the host"); | 783 | error("DNS SPOOFING is happening or the IP address for the host"); |
785 | error("and its host key have changed at the same time."); | 784 | error("and its host key have changed at the same time."); |
786 | if (ip_status != HOST_NEW) | 785 | if (ip_status != HOST_NEW) |