From: Ralph Boehme <slow@samba.org>
Date: Fri, 22 Jan 2021 11:00:56 +0000 (+0100)
Subject: smbd: simplify recursive_rmdir()
X-Git-Tag: tevent-0.11.0~1906
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=007a352c7bf2f02d9b778606da470abff2972535;p=thirdparty%2Fsamba.git

smbd: simplify recursive_rmdir()

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index ef9cca4e9aa..7a376d84b46 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -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. */