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 <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/README.nfs4acls.txt b/source3/modules/README.nfs4acls.txt
index 650513b51c76c6ac992599f158328a4ead62516c..c16b8220fbb95adcfbcce975c9ff482f37446536 100644 (file)
--- 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 a80f4f23ad710ca24286ebf2293ec0699ca2d3bb..663dc150fa7b79dc03395f2519b066399aca50b8 100644 (file)
--- 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));