From: Christof Schmitt Date: Thu, 18 Jul 2019 17:13:48 +0000 (-0700) Subject: nfs4_acls: Change default of nfs4:acedup to "merge" X-Git-Tag: tdb-1.4.2~521 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f81191d51bb345ac13402dc4c8100576b4b381cb;p=thirdparty%2Fsamba.git nfs4_acls: Change default of nfs4:acedup to "merge" All tutorials i could find that configure Samba with NFSv4 ACLs set this parameter to "merge". As this seems to be the main usecase, make this setting the default. Signed-off-by: Christof Schmitt Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/README.nfs4acls.txt b/source3/modules/README.nfs4acls.txt index 650513b51c7..c16b8220fbb 100644 --- a/source3/modules/README.nfs4acls.txt +++ b/source3/modules/README.nfs4acls.txt @@ -33,10 +33,10 @@ chown = [true|false] - false => disable support for changing owner or group acedup = [dontcare|reject|ignore|merge] -- dontcare: copy ACEs as they come, don't care with "duplicate" records. Default. +- dontcare: copy ACEs as they come, don't care with "duplicate" records. - reject: stop operation, exit acl setter operation with an error. (deprecated) - ignore: don't include the second matching ACE. (deprecated) -- merge: OR 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE +- merge: OR 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE (default) Two ACEs are considered here "duplicate" when their type and id fields are matching. diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index a80f4f23ad7..663dc150fa7 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -91,7 +91,7 @@ int smbacl4_get_vfs_params(struct connection_struct *conn, "chown", true); enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "acedup", - enum_smbacl4_acedups, e_dontcare); + enum_smbacl4_acedups, e_merge); if (enumval == -1) { DEBUG(10, ("value for %s:acedup unknown\n", SMBACL4_PARAM_TYPE_NAME));