From nobody Thu Sep 19 19:49:48 2024 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 4X8mM04SjKz5XGBs; Thu, 19 Sep 2024 19:49:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8mM03yDSz4QpV; Thu, 19 Sep 2024 19:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726775388; 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=K4EmlkdwfGAmozZ5TbUkswx/Mw48eDMTcXsnL8WOpyU=; b=AhgzBSScX/w2lOsjkDW5ndx3rm/C1YoWCgQIOavx4USw3tMwbWeIWXZXtkQEG0/dJmNH3x GqFUIpbwd/+QJzwyOWSj6tbn1E/F4QB6MBf1ZIiRC7nZqxjBetgTkptlp29MsvLFuhsePW NjGZgCYglYrV2qirjQLlQG9TmrzTqe1mmEeO1mnKFIofkZzZDbt2Zr4u/7c+E1GFNq4GiO jejrgECB1NH99Ln1KFVX5lQDdEqNNDrDOepQwOoyNNRJs7DrYz7CV9+VBIipmLsM2zgCXB qXubuCFpUumaxesauB/s01/7v4njQKQwAVXOPU1HVXlKCqXJ5pkVhhLaUK3y5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726775388; a=rsa-sha256; cv=none; b=QbkPFlYA5qh682oHn9ZhuHbs9pS6eK/v9BP1V/7L7lzJYGu+rN5ZdePwlAwgs0p2lOcY5c Mj05hSEUqrEJpu/8FWBTQnfgZnlp1iFjgTagd6t58CBhOS26Pds3u8/K+oRmLM/VmRLGVb Pffbw2Mci1i3NhwfdbWh+KhwYZsyWzDHGYAAdfOTwPPANwq4kpMdiIDLNRsL8KUz0LleXz PVQp5BHSJFSR/adg3sFZfXhA+DanQUfzmxT3Jj8Mv3SS6lN+YeTXKkmfS/H61vPRgnBaxJ ok8XKw56FxWY7PLekuwYazW5NaqYrJ/HUbM7sKYU/hRD2//lno2pFvA85m/IHA== 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=1726775388; 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=K4EmlkdwfGAmozZ5TbUkswx/Mw48eDMTcXsnL8WOpyU=; b=FTAZVL8jMyVCc1LETqa843t7cLBcH+4W45L/8eq0Uuj7BDQgYH7qI6AQ7kgJ5SX5zJTcY9 lVhqPklmqQod/9cbNnw45YnBeyB8I8jD9CGPhCdfVk0szB+gfu6xXLMnnB7UGhsawgD3PJ Vnb2kpMfq4FBGTa+LrOMzjltYfz2al4DXuuoPgD0xTybtGyNTXFNmd3wIjMI2pY6qMpgS+ HGzhf4o1NeprTgBbllraksrQd4k2UXd0mm/hODdliyLxUd0XMC4xGpFZ0r5c0y8EZkxRsb ELiRoUKYrN2xLxAt69maELqNF5vFBSnlKuQS4CX42SxRe7+VEU1Qtzi4pE+M3g== 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 4X8mM038bjzJfc; Thu, 19 Sep 2024 19:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48JJnm6p083534; Thu, 19 Sep 2024 19:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JJnmdK083531; Thu, 19 Sep 2024 19:49:48 GMT (envelope-from git) Date: Thu, 19 Sep 2024 19:49:48 GMT Message-Id: <202409191949.48JJnmdK083531@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: ae1a0648b05a - main - jail: unbreak the zfs.mount_snapshot option 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ae1a0648b05acf798816e7b83b3c10856de5c8e5 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=ae1a0648b05acf798816e7b83b3c10856de5c8e5 commit ae1a0648b05acf798816e7b83b3c10856de5c8e5 Author: Jamie Gritton AuthorDate: 2024-09-19 19:49:01 +0000 Commit: Jamie Gritton CommitDate: 2024-09-19 19:49:01 +0000 jail: unbreak the zfs.mount_snapshot option The change of its description from integer to boolean didn't actually change it to a boolean, but only made it impossible to set as either a boolean or an integer. Rather than make it work as a boolean parameter should, just revert to the old (working) integer parameter, and change the documentation to match. PR: 274263 Reported by: andrew.hotlab at hotmail --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +- usr.sbin/jail/jail.8 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 23dc03cdac92..b96393df4626 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -100,7 +100,7 @@ static struct zfs_jailparam zfs_jailparam0 = { static int zfs_jailparam_slot; SYSCTL_JAIL_PARAM_SYS_NODE(zfs, CTLFLAG_RW, "Jail ZFS parameters"); -SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "B", +SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "I", "Allow mounting snapshots in the .zfs directory for unjailed datasets"); SYSCTL_NODE(_vfs_zfs, OID_AUTO, version, CTLFLAG_RD, 0, "ZFS versions"); diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 19e89ce661a9..881d07b1b626 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 12, 2024 +.Dd September 19, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -789,8 +789,8 @@ Allow access to SYSV IPC semaphore and shared memory primitives, in the same manner as .Va sysvmsg . .It Va zfs.mount_snapshot -Allow jailed users to access the contents of ZFS snapshots under the -filesystem's +When set to 1, jailed users may access the contents of ZFS snapshots +under the filesystem's .Pa .zfs directory. If