From nobody Wed Oct 13 00:36:48 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5D96017EC7BD; Wed, 13 Oct 2021 00:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HTYWP25lzz3N6n; Wed, 13 Oct 2021 00:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 218231DDE8; Wed, 13 Oct 2021 00:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19D0amJF060382; Wed, 13 Oct 2021 00:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19D0amwp060381; Wed, 13 Oct 2021 00:36:48 GMT (envelope-from git) Date: Wed, 13 Oct 2021 00:36:48 GMT Message-Id: <202110130036.19D0amwp060381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 16dfe02e38b9 - stable/13 - syslogd: Fix bug that caused -N to drop SecureMode if specified after -s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 16dfe02e38b957206ddda0cffd7e938b01fa1302 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16dfe02e38b957206ddda0cffd7e938b01fa1302 commit 16dfe02e38b957206ddda0cffd7e938b01fa1302 Author: jfranklin13 AuthorDate: 2021-09-28 14:49:15 +0000 Commit: Mark Johnston 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;