From nobody Tue Jun 04 11:37:27 2024 X-Original-To: dev-commits-src-branches@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 4VtpVJ1TkWz5NJJm; Tue, 04 Jun 2024 11:37: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 4VtpVJ125Dz4QYn; Tue, 4 Jun 2024 11:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717501048; 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=mB8TUkfV29zjpQM7bAEyGouSIepS/LcrbbnB+Ghi5rk=; b=jziZI9UxfJrhiwyRSRuYvFYLieyVgAoV7whcKRGp2Yym1PbjSADHfVqNuU43DOdxcTIfGP a/e0JHEfcATcBZQ9e55QBg11tKM2n08qL6dmud+ccLjvQmZZBIv+9dQYW9dzOB0O8F9OAc j1wKWTITIx1JqkoYw+gEY8i8oUThhc6OZj9ZApg7qy61QCjytvtgDBz9JLipAoSaNWri7S BXzAJRWGU3SvbitDWAJlPUohrKf0vxIdZPA8Myt/fqdAGF76ASIkPFVIWrvwozqSNI0BjZ Dsv5tQFM8Drd+BjXycg99nCnSFs2Dh4c8dnh8id5YevR1Kpz1pT6TfE7ImN9Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717501048; a=rsa-sha256; cv=none; b=lqWNw+2WzbmVPEPHvEhY6X85+5qP8ukaxUWEsC9zRk71WBYo4p1KbXVbd8lrqUfuDAtaGi ovUq8QvkZ9Tw3kCz5mJlFXfxgwYSEnA4KVahrxZDPYM2vlXBOYaLibUZMZp2YlVXBK3vWW HyPpl3YMRvkBsH8GlxmxUpsndIqmZlf/SSvYfDd0E3jImES2FluaxsWNBTVusvLKkp6vn/ dZyIX26QkkV2618hBa9id8gYlaogz3ho2mb6I3v6PzF7+F3RbYMDWQBOfL3CaB4RKhGaVs rt7vuQaAEeyZTpSimU30UxdcnK+WcNUC05O7LvJfI7zl5S6qdhXOxVbqXz0KMg== 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=1717501048; 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=mB8TUkfV29zjpQM7bAEyGouSIepS/LcrbbnB+Ghi5rk=; b=oTuk/KHlUsAoimzxzseCJs0qhiUGtzzZUHNpilixxFV6xAHOfZUyzXy4kIHjKzTvPZljwA EKo66/TNw1WYqvdVJ2mHOmqxIhLD0jbnpa4M51u/UCUycMmrcfCgwlI/E3CacCTivCjXw/ paK2mtHmoSL2Dcof8V+26w0WoLFoDY/jB1Mh6WRRnmgSvlBkXrMkAsP2Imf11KLhUaTZf8 0gF+JI7enjkil3l7B0R8791hwBlabRuLW/Zj56SrlDBz+/mahLwDE9ckFdEkNT+v5tDAMV FXC7ibT9RaXlEOSAk5Wo+2rEdz2/ryJj2iTS3ouo56McRKqssbdYsmdzldfCpA== 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 4VtpVJ0dFhzHRY; Tue, 4 Jun 2024 11:37: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 454BbR4u012264; Tue, 4 Jun 2024 11:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 454BbRnM012261; Tue, 4 Jun 2024 11:37:27 GMT (envelope-from git) Date: Tue, 4 Jun 2024 11:37:27 GMT Message-Id: <202406041137.454BbRnM012261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 3247c29e92c1 - stable/14 - autofs: media: Don't include nosuid in the script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3247c29e92c1e00f89671f41c2107801acab67cf Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3247c29e92c1e00f89671f41c2107801acab67cf commit 3247c29e92c1e00f89671f41c2107801acab67cf Author: Emmanuel Vadot AuthorDate: 2023-11-07 09:42:53 +0000 Commit: Emmanuel Vadot CommitDate: 2024-06-04 11:37:06 +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 (cherry picked from commit 0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e) --- 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 }