diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-22 12:56:01 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-22 12:56:01 +1000 |
commit | 3f9fdc71219d498a996c4e4ca8330df7f598fb5d (patch) | |
tree | 902072deed2ca26a5b0b3fa5f3749783e0bd62e6 /sshconnect.c | |
parent | b357afc0a03a4238a01acf5d9641ebda9f71d500 (diff) |
- avsm@cvs.openbsd.org 2004/06/21 17:36:31
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c
cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c
monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c
ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c
sshpty.c]
make ssh -Wshadow clean, no functional changes
markus@ ok
There are also some portable-specific -Wshadow warnings to be fixed in
monitor.c and montior_wrap.c.
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sshconnect.c b/sshconnect.c index 95bb527b2..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.157 2004/05/08 00:21:31 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 | ||
@@ -767,19 +767,19 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
767 | break; | 767 | break; |
768 | case HOST_CHANGED: | 768 | case HOST_CHANGED: |
769 | if (options.check_host_ip && host_ip_differ) { | 769 | if (options.check_host_ip && host_ip_differ) { |
770 | char *msg; | 770 | char *key_msg; |
771 | if (ip_status == HOST_NEW) | 771 | if (ip_status == HOST_NEW) |
772 | msg = "is unknown"; | 772 | key_msg = "is unknown"; |
773 | else if (ip_status == HOST_OK) | 773 | else if (ip_status == HOST_OK) |
774 | msg = "is unchanged"; | 774 | key_msg = "is unchanged"; |
775 | else | 775 | else |
776 | msg = "has a different value"; | 776 | key_msg = "has a different value"; |
777 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 777 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
778 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); | 778 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); |
779 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 779 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
780 | error("The %s host key for %s has changed,", type, host); | 780 | error("The %s host key for %s has changed,", type, host); |
781 | error("and the key for the according IP address %s", ip); | 781 | error("and the key for the according IP address %s", ip); |
782 | error("%s. This could either mean that", msg); | 782 | error("%s. This could either mean that", key_msg); |
783 | 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"); |
784 | error("and its host key have changed at the same time."); | 784 | error("and its host key have changed at the same time."); |
785 | if (ip_status != HOST_NEW) | 785 | if (ip_status != HOST_NEW) |