diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 10:21:51 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 10:21:51 +1000 |
commit | ff4454dbda098d98819a108b76d3508402ab3441 (patch) | |
tree | b540833cfd4cac75f49374c2cbfe9064998cdd25 | |
parent | 0f0ef0ab1f7af50e7f48a8bc06cf3f5fc76654c7 (diff) |
- ian@cvs.openbsd.org 2008/06/12 23:24:58
[sshconnect.c]
tweak wording in message, ok deraadt@ jmc@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshconnect.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -136,6 +136,9 @@ | |||
136 | - grunk@cvs.openbsd.org 2008/06/12 22:03:36 | 136 | - grunk@cvs.openbsd.org 2008/06/12 22:03:36 |
137 | [key.c] | 137 | [key.c] |
138 | add my copyright, ok djm@ | 138 | add my copyright, ok djm@ |
139 | - ian@cvs.openbsd.org 2008/06/12 23:24:58 | ||
140 | [sshconnect.c] | ||
141 | tweak wording in message, ok deraadt@ jmc@ | ||
139 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now | 142 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now |
140 | takes 2 more args. with djm@ | 143 | takes 2 more args. with djm@ |
141 | 144 | ||
@@ -4300,4 +4303,4 @@ | |||
4300 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4303 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4301 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4304 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4302 | 4305 | ||
4303 | $Id: ChangeLog,v 1.4992 2008/06/12 22:58:05 dtucker Exp $ | 4306 | $Id: ChangeLog,v 1.4993 2008/06/13 00:21:51 dtucker Exp $ |
diff --git a/sshconnect.c b/sshconnect.c index c99874285..267670771 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.207 2008/06/12 20:38:28 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.208 2008/06/12 23:24:58 ian Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -850,7 +850,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
850 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); | 850 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); |
851 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 851 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
852 | error("The %s host key for %s has changed,", type, host); | 852 | error("The %s host key for %s has changed,", type, host); |
853 | error("and the key for the according IP address %s", ip); | 853 | error("and the key for the corresponding IP address %s", ip); |
854 | error("%s. This could either mean that", key_msg); | 854 | error("%s. This could either mean that", key_msg); |
855 | error("DNS SPOOFING is happening or the IP address for the host"); | 855 | error("DNS SPOOFING is happening or the IP address for the host"); |
856 | error("and its host key have changed at the same time."); | 856 | error("and its host key have changed at the same time."); |