diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sshconnect.c b/sshconnect.c index f29ac8088..2c028f3a6 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.148 2003/09/18 07:52:54 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.149 2003/10/14 19:42:10 jakob Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -33,16 +33,12 @@ RCSID("$OpenBSD: sshconnect.c,v 1.148 2003/09/18 07:52:54 markus Exp $"); | |||
33 | #include "misc.h" | 33 | #include "misc.h" |
34 | #include "readpass.h" | 34 | #include "readpass.h" |
35 | 35 | ||
36 | #ifdef DNS | ||
37 | #include "dns.h" | 36 | #include "dns.h" |
38 | #endif | ||
39 | 37 | ||
40 | char *client_version_string = NULL; | 38 | char *client_version_string = NULL; |
41 | char *server_version_string = NULL; | 39 | char *server_version_string = NULL; |
42 | 40 | ||
43 | #ifdef DNS | ||
44 | int verified_host_key_dns = 0; | 41 | int verified_host_key_dns = 0; |
45 | #endif | ||
46 | 42 | ||
47 | /* import */ | 43 | /* import */ |
48 | extern Options options; | 44 | extern Options options; |
@@ -730,7 +726,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
730 | /* The default */ | 726 | /* The default */ |
731 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); | 727 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); |
732 | msg2[0] = '\0'; | 728 | msg2[0] = '\0'; |
733 | #ifdef DNS | ||
734 | if (options.verify_host_key_dns) { | 729 | if (options.verify_host_key_dns) { |
735 | if (verified_host_key_dns) | 730 | if (verified_host_key_dns) |
736 | snprintf(msg2, sizeof(msg2), | 731 | snprintf(msg2, sizeof(msg2), |
@@ -741,7 +736,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
741 | "No matching host key fingerprint" | 736 | "No matching host key fingerprint" |
742 | " found in DNS.\n"); | 737 | " found in DNS.\n"); |
743 | } | 738 | } |
744 | #endif | ||
745 | snprintf(msg, sizeof(msg), | 739 | snprintf(msg, sizeof(msg), |
746 | "The authenticity of host '%.200s (%s)' can't be " | 740 | "The authenticity of host '%.200s (%s)' can't be " |
747 | "established%s\n" | 741 | "established%s\n" |
@@ -908,7 +902,6 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) | |||
908 | { | 902 | { |
909 | struct stat st; | 903 | struct stat st; |
910 | 904 | ||
911 | #ifdef DNS | ||
912 | if (options.verify_host_key_dns) { | 905 | if (options.verify_host_key_dns) { |
913 | switch(verify_host_key_dns(host, hostaddr, host_key)) { | 906 | switch(verify_host_key_dns(host, hostaddr, host_key)) { |
914 | case DNS_VERIFY_OK: | 907 | case DNS_VERIFY_OK: |
@@ -927,7 +920,6 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) | |||
927 | break; | 920 | break; |
928 | } | 921 | } |
929 | } | 922 | } |
930 | #endif /* DNS */ | ||
931 | 923 | ||
932 | /* return ok if the key can be found in an old keyfile */ | 924 | /* return ok if the key can be found in an old keyfile */ |
933 | if (stat(options.system_hostfile2, &st) == 0 || | 925 | if (stat(options.system_hostfile2, &st) == 0 || |