From nobody Thu Sep 14 17:16:14 2023 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 4RmkW23kwYz4t9bP; Thu, 14 Sep 2023 17:16:14 +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 4RmkW23HxXz3VCR; Thu, 14 Sep 2023 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694711774; 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=NDA37kymjokrtJrv9p//9JEWmvPLCJL9i8KjA1lfzy8=; b=x+g3o+K7UL4bR4Mxo1s+eK+KN9ajvEkC4IIUr+GHBXYlb8bWqgri8HfVQm3ta1O3LIiVXr lb0NVHLWwXYsDfzipHGrvs5h6bHWquwyoyFCM1H3gCBCSFE6J1He9e/QXEo9b8v7+EqrwF 5ycUNsvNCb0baENasY1eqUT/7Z1TUqkoJjDROSEiy1M7LdzWpgKnd2jL3VBh2ldrP6gwWP GJaZVnB0MDrYcVf0VV3shj6N912J5DmWoeDJjCNgizMW8238mWRpNMDVkFdmHeIPOQamTC 1Pzk8iz43jZA7idBJIwtAp8Sv91nx4VqOSiBS73Q6G5eic8bak5A7seET02Y8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694711774; a=rsa-sha256; cv=none; b=JY/dR3WdmO30vqGoaXULjxtNIqUBMWjV/8j/Jijdv5y95nGmECjfmDV4PCFtZe30qWqfgt cgjlSqURL2wB5cETTbfLRE5UBDNbKQNRNzDFYP63umwQLTVDGIjfuTa6i534rz/sB67SRh gBClFghxjK88vgUZ0QVfgjxuSOhmUe64xD3wIL37lKnhDlbmbHQDa7VGZjr4Yke01UshQH LB+CkkZ/kzJI2uSTvVDGIJPlHuM5tMXUDbjxWD0m4w7TbYsQef+EESCcU8UjU8gENpxc8n VeusAyreGCZ5c/kTwhXtOc8AHmKv3EYwD+NO3XeBkdaLDufJRx9fEdG5eUKUAw== 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=1694711774; 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=NDA37kymjokrtJrv9p//9JEWmvPLCJL9i8KjA1lfzy8=; b=mFqvn6h9tovujxRlLZPjw57xrftPhajNtQ7cx9hSN/Xd26TzYttrK9bGXLXiiJw4RKCtvi nAfkozj6UZ5crEPmKD1U9yNklpsALcutpvFT4ObIn3ofLY9TT1MgMP887yXO7O0+lRNDLP hDCpkcGlDW6gw7t0ZWw+TFH1qYsJ1vrsYWurcB5Yvu8dpzKTgs0KYwtIrncARxUEDqCjRp 0Sy+AwdsrW9aTVHNFBee8wBqsk/zqrFAPjWilNafoxH1Q+2eMxYsUoberbk7Q1OcNSqezE aArQXqb8HPYnKI945os4Lp/f/ivUVGYjdycw6Sof0sN2WzgfEIoqhbwlALZLHw== 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 4RmkW22Gcbz14j8; Thu, 14 Sep 2023 17:16:14 +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 38EHGE0Z013426; Thu, 14 Sep 2023 17:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EHGEWC013424; Thu, 14 Sep 2023 17:16:14 GMT (envelope-from git) Date: Thu, 14 Sep 2023 17:16:14 GMT Message-Id: <202309141716.38EHGEWC013424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: d737efcc1c25 - releng/14.0 - MFS jail.conf(5): Fix and expand description of ".include". 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d737efcc1c2582c793be202ed337de2589ff5301 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=d737efcc1c2582c793be202ed337de2589ff5301 commit d737efcc1c2582c793be202ed337de2589ff5301 Author: Jamie Gritton AuthorDate: 2023-09-05 20:35:54 +0000 Commit: Jamie Gritton CommitDate: 2023-09-14 17:15:44 +0000 MFS 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. Approved by: re (gjb) PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 (cherry picked from commit 165234d5527440b7755b01554ff7633e33c0d285) (cherry picked from commit 402d5960cb82eaccc33177aac821dbad1b42db1c) --- 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: