aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2023-11-08 12:00:43 +0000
committerMark Johnston <markj@FreeBSD.org>2023-11-09 16:26:33 +0000
commitac3db6ea0e968338bbe68c0d89505242b246d66f (patch)
tree2a807017f531ba369b4d83adc0c2fe494ee03762
parent2d8b79fe6036efbc6f00fe97ca482fab039f854e (diff)
downloadsrc-ac3db6ea0e968338bbe68c0d89505242b246d66f.tar.gz
src-ac3db6ea0e968338bbe68c0d89505242b246d66f.zip
makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags
This flag was leftover from testing and should have been removed. Approved by: re (cperciva) PR: 274938 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 50565cf514d32ee02a24f420551c7e65631b0716) (cherry picked from commit a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23)
-rw-r--r--usr.sbin/makefs/zfs/fs.c4
1 files 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;