]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Fix bug (only in master) introduced by 60ddee64f6e6c178766325591e80d63a673a...
authorJeremy Allison <jra@samba.org>
Thu, 3 Jun 2021 16:36:08 +0000 (09:36 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 3 Jun 2021 20:23:38 +0000 (20:23 +0000)
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

source3/smbd/close.c

index 4cb9b4e6d57df43b7db14388b3338189752075c9..3a34f0263d5c65aeb32b5a14b1379bd34366097f 100644 (file)
@@ -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;
                }