Module Name: src
Committed By: martin
Date: Thu Jan 6 16:11:07 UTC 2022
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_acl.c
Log Message:
Pull up following revision(s) (requested by hauke in ticket #1400):
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c: revision 1.7
Default files to BSD group ownership in line with ffs, after the lead
of FreeBSD <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D139076>
(patch by hannken@)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c:1.5.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c:1.5 Fri Sep 7 02:25:40 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c Thu Jan 6 16:11:07 2022
@@ -1661,7 +1661,7 @@ zfs_acl_ids_create(znode_t *dzp, int fla
} else {
acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
ZFS_GROUP, cr, &acl_ids->z_fuidp);
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) || defined(__NetBSD__)
gid = acl_ids->z_fgid = dzp->z_gid;
#else
gid = crgetgid(cr);
