diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2010-12-14 11:59:07 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2010-12-14 11:59:07 +0000 |
| commit | cf4bd825e349f7de65cd8a7b7c7ea3e5ffe72531 (patch) | |
| tree | 32adf91f0d5441c1f492a556e24a605d52f658d1 | |
| parent | 7435b3779589be6d0dad67fd1842b6efec367719 (diff) | |
don't mention key type in key-changed-warning, since we also print
this warning if a new key type appears. ok djm@
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index d872e7d3c95..15a761e74c7 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.229 2010/11/29 23:45:51 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.230 2010/12/14 11:59:06 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1208,7 +1208,6 @@ static void warn_changed_key(Key *host_key) { char *fp; - const char *type = key_type(host_key); fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); @@ -1217,9 +1216,9 @@ warn_changed_key(Key *host_key) error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); - error("It is also possible that the %s host key has just been changed.", type); + error("It is also possible that a host key has just been changed."); error("The fingerprint for the %s key sent by the remote host is\n%s.", - type, fp); + key_type(host_key), fp); error("Please contact your system administrator."); xfree(fp); |