From nobody Sun May 26 12:19:26 2024 X-Original-To: dev-commits-ports-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 4VnHrv24GXz5LK6R; Sun, 26 May 2024 12:19:27 +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 4VnHrv08ygz4TPJ; Sun, 26 May 2024 12:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716725967; 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=Y9Z9xFAq1/VBFh4Of0IF41Ddco/nsHMLLRcdLfSJXww=; b=XY3S7FamlNXi2RPiG/srdecmzld5M0euxUFnTERQiVdCjOrKMbaMSqmiDMBFHdXSej91rt 5AweTS0MSw0s/J76EztQjwL7obwVR3XRHT705o7jvFKPloBDoa+ILcyciJt4+9r5ILxbvO wWyrAuhFezi9zugp2hcfgGGmHH/wDDbfnS/7q8u01s+t/QKxOVQTbXpyBuzPIF7Q8WU1Uj dM6ndoY/2jWLgMYlRf3tgJ1fH//EfZeWORehKoZRXmkxmlitC6fmyVoaH7NyrEyMqugkQ7 4BanWslFmYKdnbgaq9JTW+CKBf2ZKMU8xnGI9ECHFSmunS8A0JOnwQvvHls5Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716725967; a=rsa-sha256; cv=none; b=qkSkrE3IXzBTvXerO7Ywlmgxj3F3imZKqQfjCZQllH0yNbIDLOUTboE6XYOUPJXa1WcFFy 5iUbxsJxwAMB0N66ItwKViVJKtsMvIENTHYfrpovqX38nuPY0guv1CcI64SX3NcGsRN2UF vEH8QvRD7ivutbaBp4tG4LFpBEk+7MEgJ1xrN7QHhf89Vkx00M3NRHQByBoFr+xrcAiYMy SkI3UtXAGkETixYaPo7uM2p6GtK1XSnY5TYwy0w0H/DWKeuBDHKjLJHT2yopM6sQrTqudv XMThiKm7XCzXSnAkvGfVCs71NWH+RBfX2Xv3N7dq8hFz5VNimLRmml+ryrUMTg== 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=1716725967; 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=Y9Z9xFAq1/VBFh4Of0IF41Ddco/nsHMLLRcdLfSJXww=; b=GbRykAn8I6YwAFHmwb2b03bRsvI+HeER3Nq2/wmes2tyQ+A99n2+Dcmja1ule9YcbzFNG9 DwAbJ+igAQ3HH6/muqI7D3RaeZhRELfookMT7g60KsBWVkN+HrIvvHwhLzwBOk+F5AIYbZ G8IXhK6qLO0jZaqgGBuBM9081I9rt/KL4/GAbyoIh8QQKspHgn94eeRyC7/QEVabN48o+f DfifGHMwb7wchj5ykzaJ0+C0tGnKDeXUpT67lksMxDmQmJODUkPpvtyeVQAFG0STlPZBKE RY7mG9BvoudsuCPAfqMEmUBLSZOZ4txZno0nqQMrR3FodSvfXjZZIr3Umy//cA== 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 4VnHrt6gvvz10V1; Sun, 26 May 2024 12:19:26 +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 44QCJQU0036445; Sun, 26 May 2024 12:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44QCJQll036442; Sun, 26 May 2024 12:19:26 GMT (envelope-from git) Date: Sun, 26 May 2024 12:19:26 GMT Message-Id: <202405261219.44QCJQll036442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yoshihiro Takahashi Subject: git: 8a7135132699 - main - net/samba416: Fix startup script in a jail environment List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a7135132699c731ec53f0f9664d772211eba3b7 Auto-Submitted: auto-generated The branch main has been updated by nyan: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a7135132699c731ec53f0f9664d772211eba3b7 commit 8a7135132699c731ec53f0f9664d772211eba3b7 Author: Yoshihiro Takahashi AuthorDate: 2024-05-26 12:16:36 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-05-26 12:16:36 +0000 net/samba416: Fix startup script in a jail environment PR: 275343 Approved by: maintainer timeout (6 months) Approved by: mikael (samba419 maintainer, ports committer) --- net/samba416/Makefile | 2 +- net/samba416/files/samba_server.in | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/samba416/Makefile b/net/samba416/Makefile index a3518fbafe51..d83f339028f6 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}416 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba416/files/samba_server.in b/net/samba416/files/samba_server.in index b45811dd9f4d..99c9b64cc78d 100644 --- a/net/samba416/files/samba_server.in +++ b/net/samba416/files/samba_server.in @@ -225,10 +225,12 @@ can_mount() if ! load_kld $kld; then return 1 fi - if [ $(${SYSCTL_N} security.jail.jailed) -eq 0 ] || - [ $(${SYSCTL_N} security.jail.mount_allowed) -eq 1 ] || - [ $(${SYSCTL_N} security.jail.mount_${kld}_allowed) -eq 1 ]; then - return 0 + if [ $(${SYSCTL_N} security.jail.jailed) -eq 0 ]; then + return 0 + fi + if [ $(${SYSCTL_N} security.jail.mount_allowed) -eq 1 ] && + [ $(${SYSCTL_N} security.jail.mount_${kld}_allowed) -eq 1 ]; then + return 0 fi return 1 }