sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

smbd: simplify recursive_rmdir()

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2021-01-22 12:00:56 +01:00 committed by Jeremy Allison
parent 0831369aef
commit 007a352c7b
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/smbd/close.c
View File

@ -866,6 +866,7 @@ bool recursive_rmdir(TALLOC_CTX *ctx,
struct smb_filename *smb_dname_full = NULL;
char *fullname = NULL;
bool do_break = true;
int unlink_flags = 0;
if (ISDOT(dname) || ISDOTDOT(dname)) {
TALLOC_FREE(talloced);
@ -910,21 +911,14 @@ bool recursive_rmdir(TALLOC_CTX *ctx,
if(!recursive_rmdir(ctx, conn, smb_dname_full)) {
goto err_break;
}
retval = SMB_VFS_UNLINKAT(conn,
conn->cwd_fsp,
smb_dname_full,
AT_REMOVEDIR);
if (retval != 0) {
goto err_break;
}
} else {
retval = SMB_VFS_UNLINKAT(conn,
conn->cwd_fsp,
smb_dname_full,
0);
if (retval != 0) {
goto err_break;
}
unlink_flags = AT_REMOVEDIR;
}
retval = SMB_VFS_UNLINKAT(conn,
conn->cwd_fsp,
smb_dname_full,
unlink_flags);
if (retval != 0) {
goto err_break;
}
/* Successful iteration. */