summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2019-10-04 12:54:05 -0700
committerRalph Boehme <slow@samba.org>2019-10-10 06:09:40 +0000
commitca5e8938ce36835b5f381379560e77fb6cf9cf90 (patch)
tree79391e262ece4b8d24c97361887be61d0e3c23fe /source3/smbd
parent7991a12e3f2b76220ab9885a98f4b427f035af81 (diff)
downloadsamba-ca5e8938ce36835b5f381379560e77fb6cf9cf90.tar.gz
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>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/close.c6
1 files changed, 5 insertions, 1 deletions
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 {