git: 9589362bc980 - main - syslogd: Fix bug that caused -N to drop SecureMode if specified after -s

[Mark Johnston]

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=9589362bc980290ff84fe61814e5716dea79e931

commit 9589362bc980290ff84fe61814e5716dea79e931
Author:     jfranklin13 <jfranklin13 at protonmail.com>
AuthorDate: 2021-09-28 14:49:15 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-09-29 13:44:11 +0000

    syslogd: Fix bug that caused -N to drop SecureMode if specified after -s
    
    MFC after:      2 weeks
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/541
---
 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 dc07d4781553..5c2555480d3f 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;