From: Volker Lendecke <vl@samba.org>
Date: Mon, 22 Jul 2024 18:56:25 +0000 (+0200)
Subject: smbd: Make parent_override_delete a bit more readable
X-Git-Tag: tdb-1.4.13~1404
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c031b660676f693739ed9e1f49754da0691ff0;p=thirdparty%2Fsamba.git

smbd: Make parent_override_delete a bit more readable

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 7999b3f082e..990a2f36745 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -85,14 +85,12 @@ static bool parent_override_delete(connection_struct *conn,
 					uint32_t access_mask,
 					uint32_t rejected_mask)
 {
-	if ((access_mask & DELETE_ACCESS) &&
-		    (rejected_mask & DELETE_ACCESS) &&
-		    can_delete_file_in_directory(conn,
-				dirfsp,
-				smb_fname))
-	{
-		return true;
+	if ((access_mask & DELETE_ACCESS) && (rejected_mask & DELETE_ACCESS)) {
+		bool ok;
+		ok = can_delete_file_in_directory(conn, dirfsp, smb_fname);
+		return ok;
 	}
+
 	return false;
 }