From: Jeremy Allison <jra@samba.org>
Date: Thu, 3 Jun 2021 16:36:08 +0000 (-0700)
Subject: s3: smbd: Fix bug (only in master) introduced by 60ddee64f6e6c178766325591e80d63a673a... 
X-Git-Tag: tevent-0.11.0~668
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=292abd2884ba80a5797135920f4b471d0b0faffe;p=thirdparty%2Fsamba.git

s3: smbd: Fix bug (only in master) introduced by 60ddee64f6e6c178766325591e80d63a673ad111.

Commit 60ddee64f6e6c178766325591e80d63a673ad111 - smbd: simplify rmdir_internals()

had a bug where it carefully set unlink_flags but then didn't use them in the
following SMB_VFS_UNLINKAT() call.

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

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Thu Jun  3 20:23:38 UTC 2021 on sn-devel-184
---

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 4cb9b4e6d57..3a34f0263d5 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1166,7 +1166,7 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, struct files_struct *fsp)
 		retval = SMB_VFS_UNLINKAT(conn,
 					  dirfsp,
 					  direntry_fname,
-					  AT_REMOVEDIR);
+					  unlink_flags);
 		if (retval != 0) {
 			goto err_break;
 		}