From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 19:54:05 +0000 (-0700)
Subject: s3: smbd: Change recursive_rmdir() to call SMB_VFS_UNLINKAT() in rmdir case.
X-Git-Tag: talloc-2.3.1~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca5e8938ce36835b5f381379560e77fb6cf9cf90;p=thirdparty%2Fsamba.git

s3: smbd: Change recursive_rmdir() to call SMB_VFS_UNLINKAT() in rmdir case.

Use conn->cwd_fsp as current fsp.

No logic change for now.

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

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 567315b712e..1de80b50007 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -905,7 +905,11 @@ bool recursive_rmdir(TALLOC_CTX *ctx,
 			if(!recursive_rmdir(ctx, conn, smb_dname_full)) {
 				goto err_break;
 			}
-			if(SMB_VFS_RMDIR(conn, smb_dname_full) != 0) {
+			retval = SMB_VFS_UNLINKAT(conn,
+					conn->cwd_fsp,
+					smb_dname_full,
+					AT_REMOVEDIR);
+			if (retval != 0) {
 				goto err_break;
 			}
 		} else {