upstream commit

allow LogLevel in sshd_config Match blocks; ok dtucker
bz#2717

Upstream-ID: 662e303be63148f47db1aa78ab81c5c2e732baa8

1 files changed, 4 insertions, 3 deletions

diff --git a/servconf.c b/servconf.c
index 73f2c2b18..a112798e4 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.307 2017/04/27 13:40:05 jsg Exp $ */
+/* $OpenBSD: servconf.c,v 1.308 2017/05/17 01:24:17 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -449,7 +449,7 @@ static struct {
         { "keyregenerationinterval", sDeprecated, SSHCFG_GLOBAL },
         { "permitrootlogin", sPermitRootLogin, SSHCFG_ALL },
         { "syslogfacility", sLogFacility, SSHCFG_GLOBAL },
-        { "loglevel", sLogLevel, SSHCFG_GLOBAL },
+        { "loglevel", sLogLevel, SSHCFG_ALL },
         { "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
         { "rhostsrsaauthentication", sDeprecated, SSHCFG_ALL },
         { "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
@@ -1345,7 +1345,7 @@ process_server_config_line(ServerOptions *options, char *line,
                 if (value == SYSLOG_LEVEL_NOT_SET)
                         fatal("%.200s line %d: unsupported log level '%s'",
                             filename, linenum, arg ? arg : "<NONE>");
-                if (*log_level_ptr == -1)
+                if (*activep && *log_level_ptr == -1)
                         *log_level_ptr = (LogLevel) value;
                 break;
 
@@ -1989,6 +1989,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
         M_CP_INTOPT(ip_qos_bulk);
         M_CP_INTOPT(rekey_limit);
         M_CP_INTOPT(rekey_interval);
+        M_CP_INTOPT(log_level);
 
         /*
          * The bind_mask is a mode_t that may be unsigned, so we can't use