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 990778d46..9657aca12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 [sftp.c] 15 [sftp.c]
16 FallBackToRsh does not exist anywhere else. Remove it from here. 16 FallBackToRsh does not exist anywhere else. Remove it from here.
17 OK deraadt. 17 OK deraadt.
18 - markus@cvs.openbsd.org 2002/07/29 18:57:30
19 [sshconnect.c]
20 print file:line
18 21
1920020730 2220020730
20 - (bal) [uidswap.c] SCO compile correction by gert@greenie.muc.de 23 - (bal) [uidswap.c] SCO compile correction by gert@greenie.muc.de
@@ -1483,4 +1486,4 @@
1483 - (stevesk) entropy.c: typo in debug message 1486 - (stevesk) entropy.c: typo in debug message
1484 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1487 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1485 1488
1486$Id: ChangeLog,v 1.2411 2002/08/01 01:25:00 mouring Exp $ 1489$Id: ChangeLog,v 1.2412 2002/08/01 01:26:29 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 8599684e5..6004bf5e4 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.132 2002/07/24 16:11:18 markus Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.133 2002/07/29 18:57:30 markus Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -882,7 +882,7 @@ show_key_from_file(const char *file, const char *host, int keytype)
882 keytype, found, &line))) { 882 keytype, found, &line))) {
883 fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); 883 fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
884 log("WARNING: %s key found for host %s\n" 884 log("WARNING: %s key found for host %s\n"
885 "in file %s line %d with\n" 885 "in %s:%d\n"
886 "%s key fingerprint %s.", 886 "%s key fingerprint %s.",
887 key_type(found), host, file, line, 887 key_type(found), host, file, line,
888 key_type(found), fp); 888 key_type(found), fp);