From nobody Tue Sep 24 17:18:59 2024 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 4XCmmg375vz5Y4x0; Tue, 24 Sep 2024 17:18:59 +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 4XCmmg2fQYz4V6m; Tue, 24 Sep 2024 17:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727198339; 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=C0ANDk8n8G/LUM2I7SHZjHGhgm8hrgY1BXsXgf4CA4g=; b=HXjmi5xj5iK74zvdLqkHudlevvuPtDebZB8jzaJDy2lMjad6UzyZ4A9LoB6PPGLSq/krsq WXBdB4gEfxeyNJ6E7g1+u3ZTV0IdlBL3Z9LyuKnnootKK6WoY5WMhzsDShViPTVlDB4C0u 2U/Z32huiAPCYDyR12HqMpaXsIoIHbU/cnck8eIu9nHdHDsbUCTiYHI3rVkVFwOskmtkU3 Zz3x09QtQm1frlmFdXbGYF0CzePe5jIJcxwUsnfSpYN+nXLFCPv1iSittVAXnhIVIjXGzo dEtAVgoFjOuHX6YSYAvQCOJwgoC8kNZhJjTJniq02vqAO49qiwMhFJ5oMeuO6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727198339; a=rsa-sha256; cv=none; b=aUPa5lR7+8uT8gSXDST9tBAMcAIIhr7BwU393MrKeqx754osrVdYVFQslFjSFVyAOR4ux/ UIsBdYL9hho6qEKsnDRIjuJEBNoO0KMLBQnsUXDfMRtKE8cI9kaUsdNovpyFtv7CI37HKb 3+jUW7uXzWF9w7o5v4MfVhlnSPn3f9ErgQa3JlVWJrC1yj3K17MxB1SfN47I0OMUIXoW+H 0/ELtBVp3wIK2NmlvER0oT7djZFps2jFoNOkfQyseqr1VHdLah2Ffrznmq5R386cQZvxmK rgCRn9kkXQIgTGZsWIqJhgWNnDSSu5sAc8woBrOzVL6OmrxmKVkrjfmNDHhz1g== 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=1727198339; 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=C0ANDk8n8G/LUM2I7SHZjHGhgm8hrgY1BXsXgf4CA4g=; b=sJERU1dJNg0GkyxM13Uxhj9YAs2Tbb5ITWy12XbrzYrU+284cIrWzBz/GpkvPy4cZSWmi2 dtIXsiRB1UsDWtW624+G6MIa2QQzgQTWAx/Kz6xJfZU2h8PAk1Hm7QnBCgYKICYmamoSLs I5TOFJB7nUOVe/YCeve4ntqyU6+A6lrA/K7AXBwqrOB9VYj9+TaakgdaPhOm/SipyKNxG3 pUerWamGsqVZ8MHDYosCoV99+wvd2x7hl3oLHAzOABogCSxEELECIMkzjYLMk0mx9f7R1c 0gnY90gFjN11/R6aeWw9j6YVbTX/QFmqXyYkqecY61RbgEWv5Gu0mZf35RZWXQ== 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 4XCmmg2FkqzdXm; Tue, 24 Sep 2024 17:18:59 +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 48OHIxgI094014; Tue, 24 Sep 2024 17:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OHIxWQ094011; Tue, 24 Sep 2024 17:18:59 GMT (envelope-from git) Date: Tue, 24 Sep 2024 17:18:59 GMT Message-Id: <202409241718.48OHIxWQ094011@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: f616b13bb35a - stable/13 - MFC jail: unbreak the zfs.mount_snapshot option 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: f616b13bb35a5ffcc904d5282f09d93fe9d3a305 Auto-Submitted: auto-generated The branch stable/13 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=f616b13bb35a5ffcc904d5282f09d93fe9d3a305 commit f616b13bb35a5ffcc904d5282f09d93fe9d3a305 Author: Jamie Gritton AuthorDate: 2024-09-19 19:49:01 +0000 Commit: Jamie Gritton CommitDate: 2024-09-24 17:18:41 +0000 MFC 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 (cherry picked from commit ae1a0648b05acf798816e7b83b3c10856de5c8e5) --- 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 42c8287a7c03..33581d018256 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -102,7 +102,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 b66e3464dc5e..18dd54aa9b68 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 June 24, 2024 +.Dd September 19, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -759,8 +759,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