]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Change recursive_rmdir() to call SMB_VFS_UNLINKAT() in rmdir case.
authorJeremy Allison <jra@samba.org>
Fri, 4 Oct 2019 19:54:05 +0000 (12:54 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 10 Oct 2019 06:09:40 +0000 (06:09 +0000)
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>
source3/smbd/close.c

index 567315b712ee1b704003fb8ffafd1bb0cf72c546..1de80b500078d4ff0a6fc474edef72bacc8f0c7d 100644 (file)
@@ -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 {