From nobody Tue Sep 5 20:37:30 2023 X-Original-To: dev-commits-src-main@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 4RgHPQ332sz4sg1m; Tue, 5 Sep 2023 20:37:30 +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 4RgHPQ2W8mz3MTC; Tue, 5 Sep 2023 20:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693946250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yok/EQP09prjdpmpsb2WwhiEs3wlcQkFABn1mms6BCw=; b=pJ7JEcBgil8tnw8OUV6be5iYrKLozVsFN9/8himhlFLyLQ1CG5lQwS4shbowp7s4can6UX riXVY0wfvTY5KKpUPQiTjomM0uVdRlCB7APNpxwpdCuDEH5XxOSTKcRsbq/UKhSRPokNed QzZczYF7iNlgGypIUoi4YtRY2le4aTCiGPMC7GuzCoZlly1NVOhUzf/X02ciAdSw2peBZ0 x+hXCjaUi4K3qhR2pzCHZZrv2CIW4HrJcefDVuU4Y874QncqWlIfQ8O62wCoaHzsx/4nwg DrATVCrPuEjmOdd5C7GSVIa5JN2+aTpVPkVabe0HTDQL+1volgxc3Ur6Df1b+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693946250; a=rsa-sha256; cv=none; b=FoAd5gykHQuC2FrcKfxIfZ1O3Lxv6ghpjntOEcTySMnOX6TpnQKKOuwOC5XcmlSv2S4SN5 0govI60QvdcB02bBkdBZSpU135+fkTPn5dPLaxiiLQOq1LLvidn6aKZw276k5m6lm0rkHZ YZZmR+FVfUUV/KpI/GlC0S8wCo7AR/YKvK6o0YqgElK1iKonE3HvVGF9kGpZB8vnIpdSij W5zzPAqJv71TL1DI4yT+Yq0cyK406j5RoVhsLMZHppev3idJwAQSWAYqJFLgSz01ojz90T JVGvEd2vKmUEBeK4zjfIh2iV31iAZ4z/rfFvtO5dPyh9xbu3Hu0HZIG+VFvnIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693946250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yok/EQP09prjdpmpsb2WwhiEs3wlcQkFABn1mms6BCw=; b=sttYknPE/qJRwo4hWN/ERcbexyJ+YxloCv0gL1/mmKG/j2xFk+IhiCrU/nczdXHXln1wCM Z7wrFRBKCzqBYf8xcyoZRyX0/TMK7rXgpdSwoTbRfLo91vdAwyNrdGzlg6I/rr1PNct150 Otl7u7dpuGi1nT9qXbukQ92DyhZyECNlwqlHUeNrj49xEqRXrMjSEFXSmSbqUbRCX1S3k+ FQ6hJDZCePvOyh+nDdkvSJQIEXzjx0nhWItz+rH9Rf7asThS0Cti2XEVN2/syIO3CWztTD Q3EPplNDl/pPiCh0W+rLqWEPXyGd3VcDuxLlthEjtv/d/OBiXZilF3P3IjR8Ug== 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 4RgHPQ1SnRznpT; Tue, 5 Sep 2023 20:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385KbU5H090759; Tue, 5 Sep 2023 20:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385KbUph090756; Tue, 5 Sep 2023 20:37:30 GMT (envelope-from git) Date: Tue, 5 Sep 2023 20:37:30 GMT Message-Id: <202309052037.385KbUph090756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 165234d55274 - main - jail.conf(5): Fix and expand description of ".include". List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 165234d5527440b7755b01554ff7633e33c0d285 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=165234d5527440b7755b01554ff7633e33c0d285 commit 165234d5527440b7755b01554ff7633e33c0d285 Author: Jamie Gritton AuthorDate: 2023-09-05 20:35:54 +0000 Commit: Jamie Gritton CommitDate: 2023-09-05 20:35:54 +0000 jail.conf(5): Fix and expand description of ".include". Escape a period that caused a line not to be includesd. Also mention that glob(3) patterns may be included, and a consequence of that. PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 --- usr.sbin/jail/jail.conf.5 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 33a66c85e7ea..0b82a972020c 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jun 3, 2023 +.Dd September 5, 2023 .Dt JAIL.CONF 5 .Os .Sh NAME @@ -164,11 +164,22 @@ and .Ss Includes A line of the form .Bd -literal -offset ident -.include "filename"; +\&.include "filename"; .Ed .Pp -will include another file in the configuration. The filename must be -a literal string, and cannot contain variable expansions. +will include another file (or files) in the configuration. +The filename should be either absolute, or relative to the +configuration file's directory. It cannot contain variable +expansions, but may contain +.Xr glob 3 +patterns. +.Pp +The included file must exist, though a filename glob may match zero or +more files. This allows inclusion of any/all files in a directory, +such as +.Dq /etc/jail.conf.d/*.conf , +or conditional inclusion of a single file, such as +.Dq jail.foo[.]conf . .Ss Comments The configuration file may contain comments in the common C, C++, and shell formats: