- dtucker@cvs.openbsd.org 2006/08/30 00:06:51

     [sshconnect2.c]
     Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL
     where previously it weren't.  bz #1221, found by Dean Kopesky, ok djm@

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a194c1ee1..ab40e629b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
      missing, by checking whether or not kerberos allocated us a context
      before attempting to free it.  Patch from Simon Wilkinson, tested by
      biorn@, ok djm@
+   - dtucker@cvs.openbsd.org 2006/08/30 00:06:51
+     [sshconnect2.c]
+     Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL
+     where previously it weren't.  bz #1221, found by Dean Kopesky, ok djm@
 
 20060824
  - (dtucker) [openbsd-compat/basename.c] Include errno.h.
@@ -5321,4 +5325,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4514 2006/08/30 01:08:04 djm Exp $
+$Id: ChangeLog,v 1.4515 2006/08/30 01:08:33 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 8b2e633c0..5846c8e9c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.161 2006/08/18 13:54:54 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.162 2006/08/30 00:06:51 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -377,7 +377,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
         debug3("input_userauth_banner");
         msg = packet_get_string(NULL);
         lang = packet_get_string(NULL);
-        if (options.log_level > SYSLOG_LEVEL_QUIET)
+        if (options.log_level >= SYSLOG_LEVEL_INFO)
                 fprintf(stderr, "%s", msg);
         xfree(msg);
         xfree(lang);