summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-08-01 01:26:29 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-08-01 01:26:29 +0000
commit4b99be899cc47064c13d8beabc32fe5c3a8f94b5 (patch)
treed54021920cacaaa4389c1170963cfe8b36c20b00
parent8d631e851534b94585f8e9dcdf21ae0367752198 (diff)
- markus@cvs.openbsd.org 2002/07/29 18:57:30
[sshconnect.c] print file:line
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 990778d4..9657aca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
[sftp.c]
FallBackToRsh does not exist anywhere else. Remove it from here.
OK deraadt.
+ - markus@cvs.openbsd.org 2002/07/29 18:57:30
+ [sshconnect.c]
+ print file:line
20020730
- (bal) [uidswap.c] SCO compile correction by gert@greenie.muc.de
@@ -1483,4 +1486,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2411 2002/08/01 01:25:00 mouring Exp $
+$Id: ChangeLog,v 1.2412 2002/08/01 01:26:29 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 8599684e..6004bf5e 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.132 2002/07/24 16:11:18 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.133 2002/07/29 18:57:30 markus Exp $");
#include <openssl/bn.h>
@@ -882,7 +882,7 @@ show_key_from_file(const char *file, const char *host, int keytype)
keytype, found, &line))) {
fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
log("WARNING: %s key found for host %s\n"
- "in file %s line %d with\n"
+ "in %s:%d\n"
"%s key fingerprint %s.",
key_type(found), host, file, line,
key_type(found), fp);