2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 7fd03cc58..aeb09b069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20010413
+ - OpenBSD CVS Sync                                                           
+   - markus@cvs.openbsd.org 2001/04/12 14:29:09 
+     [ssh.c]                                                
+     show debug output during option processing, report from 
+     pekkas@netcore.fi
+
 20010412
  - OpenBSD CVS Sync                            
    - markus@cvs.openbsd.org 2001/04/10 07:46:58
@@ -5017,4 +5024,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1100 2001/04/11 23:10:09 mouring Exp $
+$Id: ChangeLog,v 1.1101 2001/04/12 16:16:57 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 5180a8d7d..5c08de820 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.110 2001/04/11 13:56:13 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.111 2001/04/12 14:29:09 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -576,7 +576,8 @@ main(int ac, char **av)
          * Initialize "log" output.  Since we are the client all output
          * actually goes to stderr.
          */
-        log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
+        log_init(av[0], options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
+            SYSLOG_FACILITY_USER, 1);
 
         /* Read per-user configuration file. */
         snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE);