From nobody Sun May 26 12:19:27 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 4VnHrw3v26z5LKCq; Sun, 26 May 2024 12:19:28 +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 4VnHrw0kqlz4Tk6; Sun, 26 May 2024 12:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716725968; 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=FNP36oLlYsmMPsxAm1rusauld1omRaz95J1Uq1oKfUI=; b=dHdvhpLe36PiQAZg/Uxk/UwwseeYIhHgsVNPdDR1yem/MtojmlANBE6b6ikKcTkDNN2Um+ zbwTYbl5IJWQGvrV12FugiW6FJ7YU87j1VBDYlJI0E9OSnk1651QQFXqgjVCyRe+hEgVPZ VTh8TUTD1BFnmfOaFQ6CFE5utIK4QQvKr4pGBYyWXVFVRrgqxVDIObpYbImbN2MRk+bywc 0eTCfo2Dw3d/azuok2uqXYdSnUDD3TNtBI6flzIemK1MuiMJYhJ6hICDWHB+t1E7gQmhVK tGsxeqgbv985CxeLxLwJ/NLrF5PfKH3eI9dgKpBhmM5NWflA1dJbfPMGR7a0Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716725968; a=rsa-sha256; cv=none; b=VRk1VRLZkDewDZ4tZUFWySqASPkmQhlfAN/GOH/PyNsr31DYPPco2JPjZmIGsgiNcdv9xi SbDkvkHZwVlCLxoUvtAUtgU2C2C34h5xXeJeleARH5Mb8/iOtXrK1Ps9me4Lxj+72v8z6A wj526nx1EyaYSvs23IMkZ4jhDNDMcPwHNJKdwBLSbcl+NT6WL2nsmU0LqNE3QSOGJQL8/C xRPKjJunSuBll+16Bu2i9rbL3+3M3Z6F1fuYhSf+acFpNSUKYN8dXxAFIso2FwT0rA8X/l PYzzQfARTjV2rEdQAbP7cvvd7GiGBYsUKPr3K6Gt0ozMwwyzopsvuy1LoIRH+w== 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=1716725968; 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=FNP36oLlYsmMPsxAm1rusauld1omRaz95J1Uq1oKfUI=; b=s6+4rnafUgSG/+KUQFzpwPYsVjPoHOQZ0jY1fybufYiv1xnnq9yIlki2zlQifIE/fIRV53 j5etxeL0hPiTRJ804AjieJjavrKFitQyoCW0NgoKZbvDULtyseVKe35gRMhbj0sXZ1TuQV EV1oQ4vtwHjpEi6UTcBRoKcLsiXGDudvhy/HhxXRQZl9rQ+UiMjhdcpH8nR/vMhoSrWvZc JtoLCx/gSU1NhrwArP1bAK15DSNbPxnQC4AcxbDQ/QODQXkGEktts6A8zNBFHz1ZLD5YHj ch1Rk2J5aWTVxCcRGRlu9saxoPtsIiYlwD/J+/F0FXdWF9s5lEaAtAFMN4ioRA== 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 4VnHrw0L81z10ZP; Sun, 26 May 2024 12:19:28 +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 44QCJRjk036496; Sun, 26 May 2024 12:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44QCJRgc036493; Sun, 26 May 2024 12:19:27 GMT (envelope-from git) Date: Sun, 26 May 2024 12:19:27 GMT Message-Id: <202405261219.44QCJRgc036493@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: 9e9e06725ba1 - main - net/samba419: 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: 9e9e06725ba1e9475da8f6e02ae81b32044dee88 Auto-Submitted: auto-generated The branch main has been updated by nyan: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e9e06725ba1e9475da8f6e02ae81b32044dee88 commit 9e9e06725ba1e9475da8f6e02ae81b32044dee88 Author: Yoshihiro Takahashi AuthorDate: 2024-05-26 12:17:36 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-05-26 12:17:36 +0000 net/samba419: Fix startup script in a jail environment PR: 275343 Approved by: mikael (maintainer, ports committer) --- net/samba419/Makefile | 1 + net/samba419/files/samba_server.in | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/samba419/Makefile b/net/samba419/Makefile index 66f012b8065e..8bdb0ed8ae1f 100644 --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -1,5 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}419 PORTVERSION= ${SAMBA4_VERSION} +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba419/files/samba_server.in b/net/samba419/files/samba_server.in index b45811dd9f4d..99c9b64cc78d 100644 --- a/net/samba419/files/samba_server.in +++ b/net/samba419/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 }