From ab2db41b6173565461b73f48e97d94ffe0ab9353 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 2 Jun 2003 19:09:13 +1000 Subject: [PATCH] - djm@cvs.openbsd.org 2003/05/26 12:54:40 [sshconnect.c] fix format strings; ok markus@ --- ChangeLog | 6 +++++- sshconnect.c | 6 +++--- 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 @@ set at runtime using AddressFamily option. - (djm) Fix use of macro before #define in cipher-aes.c - (djm) Sync license on openbsd-compat/bindresvport.c with OpenBSD CVS + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2003/05/26 12:54:40 + [sshconnect.c] + fix format strings; ok markus@ 20030530 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at @@ -1634,4 +1638,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2760 2003/06/02 08:59:08 djm Exp $ +$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 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.142 2003/05/23 08:29:30 djm Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.143 2003/05/26 12:54:40 djm Exp $"); #include @@ -848,7 +848,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, host_file, host_line); } if (options.strict_host_key_checking == 1) { - logit(msg); + logit("%s", msg); error("Exiting, you have requested strict checking."); goto fail; } else if (options.strict_host_key_checking == 2) { @@ -857,7 +857,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, if (!confirm(msg)) goto fail; } else { - logit(msg); + logit("%s", msg); } }