From ca5e8938ce36835b5f381379560e77fb6cf9cf90 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 4 Oct 2019 12:54:05 -0700 Subject: [PATCH] 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 Reviewed-by: Ralph Boehme --- source3/smbd/close.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 { -- 2.47.3