summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshconnect.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b1ed0552e..e2989c425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
8 set at runtime using AddressFamily option. 8 set at runtime using AddressFamily option.
9 - (djm) Fix use of macro before #define in cipher-aes.c 9 - (djm) Fix use of macro before #define in cipher-aes.c
10 - (djm) Sync license on openbsd-compat/bindresvport.c with OpenBSD CVS 10 - (djm) Sync license on openbsd-compat/bindresvport.c with OpenBSD CVS
11 - (djm) OpenBSD CVS Sync
12 - djm@cvs.openbsd.org 2003/05/26 12:54:40
13 [sshconnect.c]
14 fix format strings; ok markus@
11 15
1220030530 1620030530
13 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at 17 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
@@ -1634,4 +1638,4 @@
1634 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1638 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1635 ok provos@ 1639 ok provos@
1636 1640
1637$Id: ChangeLog,v 1.2760 2003/06/02 08:59:08 djm Exp $ 1641$Id: ChangeLog,v 1.2761 2003/06/02 09:09:13 djm Exp $
diff --git a/sshconnect.c b/sshconnect.c
index dfa2e5b09..0ff4b2bcc 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.142 2003/05/23 08:29:30 djm Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.143 2003/05/26 12:54:40 djm Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -848,7 +848,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
848 host_file, host_line); 848 host_file, host_line);
849 } 849 }
850 if (options.strict_host_key_checking == 1) { 850 if (options.strict_host_key_checking == 1) {
851 logit(msg); 851 logit("%s", msg);
852 error("Exiting, you have requested strict checking."); 852 error("Exiting, you have requested strict checking.");
853 goto fail; 853 goto fail;
854 } else if (options.strict_host_key_checking == 2) { 854 } else if (options.strict_host_key_checking == 2) {
@@ -857,7 +857,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
857 if (!confirm(msg)) 857 if (!confirm(msg))
858 goto fail; 858 goto fail;
859 } else { 859 } else {
860 logit(msg); 860 logit("%s", msg);
861 } 861 }
862 } 862 }
863 863