git: a8043cc0d49b - stable/14 - makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 09 Nov 2023 14:41:18 UTC
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23
commit a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-11-08 12:00:43 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-11-09 14:41:09 +0000
makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags
This flag was leftover from testing and should have been removed.
PR: 274938
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 50565cf514d32ee02a24f420551c7e65631b0716)
---
usr.sbin/makefs/zfs/fs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c
index b0a4c639f256..9413241da0c7 100644
--- a/usr.sbin/makefs/zfs/fs.c
+++ b/usr.sbin/makefs/zfs/fs.c
@@ -403,8 +403,8 @@ fs_populate_sattrs(struct fs_populate_arg *arg, const fsnode *cur,
}
daclcount = nitems(aces);
- flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_NO_EXECS_DENIED |
- ZFS_ARCHIVE | ZFS_AV_MODIFIED; /* XXX-MJ */
+ flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_ARCHIVE |
+ ZFS_AV_MODIFIED;
gen = 1;
gid = sb->st_gid;
mode = sb->st_mode;