From nobody Fri Nov 24 09:45:42 2023 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 4Sc98R0wMdz520w3; Fri, 24 Nov 2023 09:45:43 +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 4Sc98R0STbz4Cwg; Fri, 24 Nov 2023 09:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700819143; 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=qR9qY7hypbjCY9jYPPtPBlXs5G0D+4/Kd23EmPAZa0c=; b=MhMfe61yIL+s80a2LjS5ZksDnAe0RTS+ULk/CRgnLLCUURSEUXOem9Lop5cYuLudF/vleE ApkldS6FjnKA7vc1Dnfyoi383sk23HwCLaG1OtueNo59RLStwGpwwKgG4jjf1Tv1X23UFB BHhHwbwgHJgQvai4qiymXu3BmBE232x1zGuFK3d9EPFRfMyr9cF38nD47UkhokpyUQBBSy F7NXh4lEhUmOZpoz8ovgMQ1MW5ClwrVq+ktp/gtHYnI5JELRr3xANkPjltreyh0uYyIIfA iA2XXANu9bGVKTQgpf3pAcT3r0C4jNwvtg9r15ECFia55BqOOhjgkzpnInWkmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700819143; 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=qR9qY7hypbjCY9jYPPtPBlXs5G0D+4/Kd23EmPAZa0c=; b=MFOTkXu+7jpDZZO4pDRJLX6i4cjcJKkydxvIQhCNi2YJOhYxZzsaHeEWnv2Ib4b0ARvYhD 2YNWRIuQcaJz7ECjQMQRkaDq0AQh8pY+xIRk0HuEu5rls/VpHcvs87/9O1mjydcK6VMseS 1XBPkQ3nizhP9FSfy0nhqGyD8fowmmOa6qNFGx4Y5fDhwyKmlfw/iOI69GnGNVCGnKJQcC 9fBQOXNRW9pBVq5mjJs7IpjdCWWQ0X9Ui62zlXB/n+IfJE8bS3MdIUmBYs1XS1RwQptK2g hGaQuBciwVigkTMQslWNZ3TVJjhFXLkiM8Qc4VIsnX90l6Ut0LhdY/GwXlHO7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700819143; a=rsa-sha256; cv=none; b=ve0MAZM6c+myR38T26uGE9nG+sAeRQanR9bok/H2bXz/cuZrKx/u73tIR9crLuWEW354u8 09z9lEEGGDT0sFN1puPZ9WljwV3TP9kZ3e8ogoYYIdARog8gfsfnNXz2+GpeUhBO8abHHz Ah2hPwtkFGMx9mamTISQabIlqFpM92M6Mbb5oUTxV/mFakZ6BMNMNSwvZpN+meDXb0j1Xq Qvv3GDJwrtoLRcoWv6DcTX6+488YYzabw2kGLKrDaKDsbbHXJejsIL/27+lnoA8Zrf2haw LkXw83LQx7jtfMVCbHK/9t3LfjJlrraeidLc0Bs/4UtDAG8EcnbwRI2bnYNQ8w== 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 4Sc98Q6WkSzgT2; Fri, 24 Nov 2023 09:45:42 +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 3AO9jget079782; Fri, 24 Nov 2023 09:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO9jgdS079780; Fri, 24 Nov 2023 09:45:42 GMT (envelope-from git) Date: Fri, 24 Nov 2023 09:45:42 GMT Message-Id: <202311240945.3AO9jgdS079780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e commit 0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e Author: Emmanuel Vadot AuthorDate: 2023-11-07 09:42:53 +0000 Commit: Emmanuel Vadot CommitDate: 2023-11-24 09:44:20 +0000 autofs: media: Don't include nosuid in the script We already have nosuid option in auto_master so no need to redefine it. Also it's easier for a user to modify the auto_master configuration file than the script (which shouldn't be modified). Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D42492 Reviewed by: rew --- usr.sbin/autofs/autofs/special_media | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media index d72ddddddb2e..33fa4544d028 100755 --- a/usr.sbin/autofs/autofs/special_media +++ b/usr.sbin/autofs/autofs/special_media @@ -40,7 +40,7 @@ print_map_entry() { case "${_fstype}" in "exfat") if [ -f "/usr/local/sbin/mount.exfat" ]; then - echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid :/dev/${_p}" + echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype} :/dev/${_p}" else /usr/bin/logger -p info -t "special_media[$$]" \ "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first" @@ -49,7 +49,7 @@ print_map_entry() { ;; "ntfs") if [ -f "/usr/local/bin/ntfs-3g" ]; then - echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid :/dev/${_p}" + echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype} :/dev/${_p}" else /usr/bin/logger -p info -t "special_media[$$]" \ "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first" @@ -57,10 +57,10 @@ print_map_entry() { fi ;; "ext2fs" | "msdosfs") - echo "-fstype=${_fstype},nosuid,async :/dev/${_p}" + echo "-fstype=${_fstype},async :/dev/${_p}" ;; *) - echo "-fstype=${_fstype},nosuid :/dev/${_p}" + echo "-fstype=${_fstype} :/dev/${_p}" ;; esac }