From nobody Fri Nov 24 15:00:22 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 4ScJ7Y5833z51fjK; Fri, 24 Nov 2023 15:00:25 +0000 (UTC) (envelope-from SRS0=oA7f=HF=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4ScJ7Y4NvNz4NbQ; Fri, 24 Nov 2023 15:00:25 +0000 (UTC) (envelope-from SRS0=oA7f=HF=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Fri, 24 Nov 2023 16:00:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1700838022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pGC+HdmTk7zxovESDBn0kDCeXZziTj32nLfyvpcizwo=; b=IjHi5IJ61MZ7X2ZT99Rz4H39hsuok9VlPtt5Js2eakglUcNXnNU3cvEsNUrL6fMBMqWvnr +ptp0EKNuU617bJb+f3Nzn5sM/XEyqBojX81oV3oamSKAHTW1jaxa1hbKE/RCKZzFoaLS0 NOF0GFuGqn8rnrjNgcU9uY6Mq/AiZFW0P9z3b/FTUMqN379CJRz29JN1MuMdJ5dyXMLUA6 /ttl7iXhXhkHsilJJ/7HVIy11QtgAUsl/EikkiKo6q+TpTYENA1X/+zrpZPCsIwtYUZODj ESfV1SheOMhV1wxo7SycS+ZS6LJi8OoMByusnxkpSzkzoKzXzrX9XU+4ih8olw== From: Ronald Klop To: Emmanuel Vadot Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, Emmanuel Vadot , dev-commits-src-main@FreeBSD.org Message-ID: <194935678.8142.1700838022590@localhost> In-Reply-To: <20231124155107.fe95c803b3c5d0f1b18e3c9d@bidouilliste.com> References: <202311240945.3AO9jgdS079780@gitrepo.freebsd.org> <2003387449.7766.1700837236386@localhost> <20231124155107.fe95c803b3c5d0f1b18e3c9d@bidouilliste.com> Subject: Re: 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: multipart/alternative; boundary="----=_Part_8141_1624612915.1700838022586" X-Mailer: Realworks (680.25) Importance: Normal X-Priority: 3 (Normal) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Rspamd-Queue-Id: 4ScJ7Y4NvNz4NbQ ------=_Part_8141_1624612915.1700838022586 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Ah thanks. Didn't notice the remark in the commit message. Van: Emmanuel Vadot Datum: vrijdag, 24 november 2023 15:51 Aan: Ronald Klop CC: Emmanuel Vadot , dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: Re: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script > > Hi, > > On Fri, 24 Nov 2023 15:47:16 +0100 (CET) > Ronald Klop wrote: > > > 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. > > No it doesn't. > As noted in the commit message nosuid is already present in > auto_master, I'm just removing a duplicate here. > > > Regards. > > Ronald. > > > > > > Van: Emmanuel Vadot > > 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 > > > 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 > > > } > > > > > > > > > > > > > > > > > > > -- > Emmanuel Vadot > > > ------=_Part_8141_1624612915.1700838022586 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit Ah thanks. Didn't notice the remark in the commit message.
 

Van: Emmanuel Vadot <manu@bidouilliste.com>
Datum: vrijdag, 24 november 2023 15:51
Aan: Ronald Klop <ronald-lists@klop.ws>
CC: Emmanuel Vadot <manu@FreeBSD.org>, dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: Re: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script


 Hi,

On Fri, 24 Nov 2023 15:47:16 +0100 (CET)
Ronald Klop <ronald-lists@klop.ws> wrote:

> 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.

 No it doesn't.
 As noted in the commit message nosuid is already present in
auto_master, I'm just removing a duplicate here.

> 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
> >  }
> >  
> >
> >
> >
>
>  


-- 
Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>


  ------=_Part_8141_1624612915.1700838022586--