nfs4acls: update default NFS4 ACL version to 4.1

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl
index f836436dc6e744c200bc47aa1e0a10e8d1aa7178..10a60ed1caf42695ea7d5119dbb60af819ae8bde 100644 (file)
--- a/librpc/idl/nfs4acl.idl
+++ b/librpc/idl/nfs4acl.idl
@@ -21,7 +21,7 @@ interface nfs4acl_interface
 
        const uint8 ACL4_XATTR_VERSION_40      = 0x00;
        const uint8 ACL4_XATTR_VERSION_41      = 0x01;
-       const uint8 ACL4_XATTR_VERSION_DEFAULT = ACL4_XATTR_VERSION_40;
+       const uint8 ACL4_XATTR_VERSION_DEFAULT = ACL4_XATTR_VERSION_41;
 
        const uint8 ACL4_AUTO_INHERIT  = 0x01;
        const uint8 ACL4_PROTECTED     = 0x02;

diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index e0266d236572747dc1f4b64fb48a2431f0587b54..31b85aea13f312d2f20d1aeabab51e6153f7d968 100644 (file)
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -350,7 +350,7 @@ static int nfs4acl_connect(struct vfs_handle_struct *handle,
        nfs_version = (unsigned)lp_parm_int(SNUM(handle->conn),
                                            "nfs4acl_xattr",
                                            "version",
-                                           40);
+                                           41);
        switch (nfs_version) {
        case 40:
                config->nfs_version = ACL4_XATTR_VERSION_40;