From: Noel Power <noel.power@suse.com>
Date: Fri, 19 Feb 2021 14:47:07 +0000 (+0000)
Subject: s2/modules: nfs4acl_smb4acl_set_fn SMB_VFS_NEXT_SETXATTR -> SMB_VFS_NEXT_FFSETXATTR
X-Git-Tag: tevent-0.11.0~1574
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7e2ecca8559eac524f32f4306859a2773da3b61;p=thirdparty%2Fsamba.git

s2/modules: nfs4acl_smb4acl_set_fn SMB_VFS_NEXT_SETXATTR -> SMB_VFS_NEXT_FFSETXATTR

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index f1b9022f2b2..e0327e1f64c 100644
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -335,14 +335,8 @@ static bool nfs4acl_smb4acl_set_fn(vfs_handle_struct *handle,
 		return false;
 	}
 
-	if (fsp_get_pathref_fd(fsp) != -1) {
-		ret = SMB_VFS_NEXT_FSETXATTR(handle, fsp, config->xattr_name,
-					     blob.data, blob.length, 0);
-	} else {
-		ret = SMB_VFS_NEXT_SETXATTR(handle, fsp->fsp_name,
-					    config->xattr_name,
-					    blob.data, blob.length, 0);
-	}
+	ret = SMB_VFS_NEXT_FSETXATTR(handle, fsp, config->xattr_name,
+				     blob.data, blob.length, 0);
 	if (ret != 0) {
 		saved_errno = errno;
 	}