Re: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script

From: Ronald Klop <ronald-lists_at_klop.ws>
Date: Fri, 24 Nov 2023 14:47:16 UTC
Hi,

Wouldn't this apply for a /usr/src/UPDATING or /usr/src/RELNOTES entry?
As it might change default behaviour on a security measure.

Regards.
Ronald.

 
Van: Emmanuel Vadot <manu@FreeBSD.org>
Datum: vrijdag, 24 november 2023 10:45
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script
> 
> The branch main has been updated by manu:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e
> 
> commit 0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e
> Author:     Emmanuel Vadot <manu@FreeBSD.org>
> AuthorDate: 2023-11-07 09:42:53 +0000
> Commit:     Emmanuel Vadot <manu@FreeBSD.org>
> 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
>  }
>  
> 
> 
>