[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  292abd2884b s3: smbd: Fix bug (only in master) introduced by 60ddee64f6e6c178766325591e80d63a673ad111.
      from  b0f28dcd7a3 s3: smbd: Remove parent_smb_fname(), no longer used.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 292abd2884ba80a5797135920f4b471d0b0faffe
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jun 3 09:36:08 2021 -0700

    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 at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu Jun  3 20:23:38 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/close.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

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;
 		}


-- 
Samba Shared Repository