diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-06-22 04:56:01 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-22 04:56:01 +0200 |
| commit | 3f9fdc71219d498a996c4e4ca8330df7f598fb5d (patch) | |
| tree | 902072deed2ca26a5b0b3fa5f3749783e0bd62e6 /sshconnect.c | |
| parent | - djm@cvs.openbsd.org 2004/06/20 19:28:12 (diff) | |
| download | openssh-3f9fdc71219d498a996c4e4ca8330df7f598fb5d.tar.xz openssh-3f9fdc71219d498a996c4e4ca8330df7f598fb5d.zip | |
- 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 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.157 2004/05/08 00:21:31 djm Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.158 2004/06/21 17:36:31 avsm Exp $"); #include <openssl/bn.h> @@ -767,19 +767,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) |