librpc/idl: rename NFS4 ACL xattr name define

No change in behaviour.

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 5a3d0268f21ff4e71704c4dc5808f87faa857fe8..3d6894a604c3933d5c8c1cdd37cb1af4b95a3e5f 100644 (file)
--- a/librpc/idl/nfs4acl.idl
+++ b/librpc/idl/nfs4acl.idl
@@ -13,7 +13,7 @@ import "misc.idl", "security.idl";
 ]
 interface nfs4acl_interface
 {
-       const char *NFS4ACL_XATTR_NAME = "system.nfs4acl";
+       const char *NFS4ACL_NDR_XATTR_NAME = "system.nfs4acl";
 
        const char *NFS4ACL_XATTR_OWNER_WHO      = "OWNER@";
        const char *NFS4ACL_XATTR_GROUP_WHO      = "GROUP@";

diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index 7465ba8afbf11bbc3ccf0733e7189f227f9cde08..fd47b86255e1c59a5e4385bd6750baf33cd97e61 100644 (file)
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -135,7 +135,7 @@ static NTSTATUS nfs4_fget_nfs4_acl(vfs_handle_struct *handle, TALLOC_CTX *mem_ct
                        errno = ENOMEM;
                        return NT_STATUS_NO_MEMORY;
                }
-               length = SMB_VFS_NEXT_FGETXATTR(handle, fsp, NFS4ACL_XATTR_NAME, blob.data, blob.length);
+               length = SMB_VFS_NEXT_FGETXATTR(handle, fsp, NFS4ACL_NDR_XATTR_NAME, blob.data, blob.length);
                blob.length = length;
        } while (length == -1 && errno == ERANGE);
        if (length == -1) {
@@ -167,7 +167,7 @@ static NTSTATUS nfs4_get_nfs4_acl(vfs_handle_struct *handle,
                        return NT_STATUS_NO_MEMORY;
                }
                length = SMB_VFS_NEXT_GETXATTR(handle, smb_fname,
-                               NFS4ACL_XATTR_NAME, blob.data, blob.length);
+                               NFS4ACL_NDR_XATTR_NAME, blob.data, blob.length);
                blob.length = length;
        } while (length == -1 && errno == ERANGE);
        if (length == -1) {
@@ -281,7 +281,7 @@ static bool nfs4acl_xattr_set_smb4acl(vfs_handle_struct *handle,
                errno = EINVAL;
                return false;
        }
-       ret = SMB_VFS_NEXT_SETXATTR(handle, smb_fname, NFS4ACL_XATTR_NAME,
+       ret = SMB_VFS_NEXT_SETXATTR(handle, smb_fname, NFS4ACL_NDR_XATTR_NAME,
                                    blob.data, blob.length, 0);
        if (ret != 0) {
                DEBUG(0, ("can't store acl in xattr: %s\n", strerror(errno)));
@@ -322,7 +322,7 @@ static bool nfs4acl_xattr_fset_smb4acl(vfs_handle_struct *handle,
        if (fsp->fh->fd == -1) {
                DEBUG(0, ("Error: fsp->fh->fd == -1\n"));
        }
-       ret = SMB_VFS_NEXT_FSETXATTR(handle, fsp, NFS4ACL_XATTR_NAME,
+       ret = SMB_VFS_NEXT_FSETXATTR(handle, fsp, NFS4ACL_NDR_XATTR_NAME,
                                     blob.data, blob.length, 0);
        if (ret != 0) {
                DEBUG(0, ("can't store acl in xattr: %s\n", strerror(errno)));

diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c
index b07d2ba9b41bf66f74ac0fc68c35d047e46f415c..fc6c230817d203dd1436b3d290a045253453aad7 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl_nfs4.c
+++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c
@@ -47,7 +47,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename
        NT_STATUS_HAVE_NO_MEMORY(acl);
 
        status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name, fd, 
-                                    NFS4ACL_XATTR_NAME,
+                                    NFS4ACL_NDR_XATTR_NAME,
                                     acl, (void *) ndr_pull_nfs4acl);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(acl);
@@ -176,7 +176,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename
 
        privs = root_privileges();
        status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd, 
-                                    NFS4ACL_XATTR_NAME, 
+                                    NFS4ACL_NDR_XATTR_NAME,
                                     &acl, (void *) ndr_push_nfs4acl);
        talloc_free(privs);