git: 16dfe02e38b9 - stable/13 - syslogd: Fix bug that caused -N to drop SecureMode if specified after -s
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 13 Oct 2021 00:36:48 UTC
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=16dfe02e38b957206ddda0cffd7e938b01fa1302
commit 16dfe02e38b957206ddda0cffd7e938b01fa1302
Author: jfranklin13 <jfranklin13@protonmail.com>
AuthorDate: 2021-09-28 14:49:15 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-10-13 00:36:11 +0000
syslogd: Fix bug that caused -N to drop SecureMode if specified after -s
Pull Request: https://github.com/freebsd/freebsd-src/pull/541
(cherry picked from commit 9589362bc980290ff84fe61814e5716dea79e931)
---
usr.sbin/syslogd/syslogd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 9ed0b8098753..c3b8af4fa8fa 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -677,7 +677,8 @@ main(int argc, char *argv[])
break;
case 'N':
NoBind = 1;
- SecureMode = 1;
+ if (!SecureMode)
+ SecureMode = 1;
break;
case 'n':
resolve = 0;