From a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Wed, 8 Nov 2023 07:00:43 -0500 Subject: [PATCH] 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 b0a4c639f25..9413241da0c 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;