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 7999b3f082ed62c4a686b2f8edc8411ab142a880..990a2f367450361cd2a40d9686f598ba442c189d 100644 (file)
--- 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;
 }