summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-31 23:11:25 +0000
committerDamien Miller <djm@mindrot.org>2020-02-01 10:22:32 +1100
commit245399dfb3ecebc6abfc2ef4ee2e650fa9f6942b (patch)
treeeefe60faa1304347a09903877c8fe6aad198ae4f
parent7365f28a66d1c443723fbe6f4a2612ea6002901e (diff)
upstream: force early logging to stderr if debug_flag (-d) is set;
avoids missing messages from re-exec config passing OpenBSD-Commit-ID: 02484b8241c1f49010e7a543a7098e6910a8c9ff
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 9d0d8b4f..f4e659f1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.547 2020/01/31 23:08:08 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.548 2020/01/31 23:11:25 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1664,7 +1664,7 @@ main(int ac, char **av)
SYSLOG_LEVEL_INFO : options.log_level,
options.log_facility == SYSLOG_FACILITY_NOT_SET ?
SYSLOG_FACILITY_AUTH : options.log_facility,
- log_stderr || !inetd_flag);
+ log_stderr || !inetd_flag || debug_flag);
/*
* Unset KRB5CCNAME, otherwise the user's session may inherit it from