summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-05-17 01:24:17 +0000
committerDamien Miller <djm@mindrot.org>2017-05-17 11:25:22 +1000
commit54cd41a4663fad66406dd3c8fe0e4760ccd8a899 (patch)
tree382e0546d26cf1bb6ce54c0dc1b5278df697450c /monitor_wrap.c
parent277abcda3f1b08d2376686f0ef20320160d4c8ab (diff)
upstream commit
allow LogLevel in sshd_config Match blocks; ok dtucker bz#2717 Upstream-ID: 662e303be63148f47db1aa78ab81c5c2e732baa8
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 64ff92885..f2eec5a77 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.89 2016/08/13 17:47:41 markus Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.90 2017/05/17 01:24:17 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -295,6 +295,7 @@ out:
295#undef M_CP_STRARRAYOPT 295#undef M_CP_STRARRAYOPT
296 296
297 copy_set_server_options(&options, newopts, 1); 297 copy_set_server_options(&options, newopts, 1);
298 log_change_level(options.log_level);
298 free(newopts); 299 free(newopts);
299 300
300 buffer_free(&m); 301 buffer_free(&m);