From owner-svn-src-all@freebsd.org Sat Nov 10 10:46:40 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22008112FF86; Sat, 10 Nov 2018 10:46:40 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9B21F8454B; Sat, 10 Nov 2018 10:46:39 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6176421D52; Sat, 10 Nov 2018 10:46:39 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAAkdgO041623; Sat, 10 Nov 2018 10:46:39 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAAkdPs041621; Sat, 10 Nov 2018 10:46:39 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201811101046.wAAAkdPs041621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 10 Nov 2018 10:46:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340318 - head/usr.sbin/newsyslog X-SVN-Group: head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: head/usr.sbin/newsyslog X-SVN-Commit-Revision: 340318 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9B21F8454B X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2018 10:46:40 -0000 Author: woodsb02 (ports committer) Date: Sat Nov 10 10:46:38 2018 New Revision: 340318 URL: https://svnweb.freebsd.org/changeset/base/340318 Log: newsyslog.conf: Restrict included files in default config to [!.]*.conf The new default config will only include files from the following directories which end with '.conf' and do not beginning with a '.' character: - /etc/newsyslog.conf.d/ - /usr/local/etc/newsyslog.conf.d/ This matches the syslog.conf(5) functionality, and also prevents '.sample' or '.pkgnew' files being included. This is important for ports which install files in /usr/local/etc/newsyslog.conf.d/ and also for pkgbase. Approved by: eadler Approved by: bapt Relnotes: yes Differential Revision: https://reviews.freebsd.org/D17086 Modified: head/usr.sbin/newsyslog/newsyslog.8 head/usr.sbin/newsyslog/newsyslog.conf Modified: head/usr.sbin/newsyslog/newsyslog.8 ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:32:55 2018 (r340317) +++ head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:46:38 2018 (r340318) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd July 19, 2018 +.Dd November 10, 2018 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -268,10 +268,12 @@ will examine all files listed in the configuration fil .Nm configuration file .It Pa /etc/newsyslog.conf.d -Each file in this directory will be included by the default +By default each file in this directory ending in '.conf' and not beginning with +a '.' will be included by the default .Pa newsyslog.conf . .It Pa /usr/local/etc/newsyslog.conf.d -Each file in this directory will be included by the default +By default each file in this directory ending in '.conf' and not beginning with +a '.' will be included by the default .Pa newsyslog.conf . .El .Sh COMPATIBILITY Modified: head/usr.sbin/newsyslog/newsyslog.conf ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:32:55 2018 (r340317) +++ head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:46:38 2018 (r340318) @@ -31,5 +31,5 @@ /var/log/utx.log 644 3 * @01T05 B /var/log/weekly.log 640 5 * $W6D0 JN - /etc/newsyslog.conf.d/* - /usr/local/etc/newsyslog.conf.d/* + /etc/newsyslog.conf.d/[!.]*.conf + /usr/local/etc/newsyslog.conf.d/[!.]*.conf