From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 21:37:01 +0000 (-0700)
Subject: s3: VFS: vfs_acl_common: Convert rmdir_acl_common() to use UNLINKAT instead of RMDIR.
X-Git-Tag: talloc-2.3.1~428
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0df3371e7a483fd286e96f95c8a4c227e2b686ab;p=thirdparty%2Fsamba.git

s3: VFS: vfs_acl_common: Convert rmdir_acl_common() to use UNLINKAT instead of RMDIR.

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

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index c7b6fea5702..35dc82ee11d 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -1192,7 +1192,10 @@ int rmdir_acl_common(struct vfs_handle_struct *handle,
 	int ret;
 
 	/* Try the normal rmdir first. */
-	ret = SMB_VFS_NEXT_RMDIR(handle, smb_fname);
+	ret = SMB_VFS_NEXT_UNLINKAT(handle,
+			dirfsp,
+			smb_fname,
+			AT_REMOVEDIR);
 	if (ret == 0) {
 		return 0;
 	}