From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 12 Sep 2022 17:41:25 +0000 (+0200)
Subject: s3:smbd: remove one indentation level in close_directory()
X-Git-Tag: talloc-2.4.0~830
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0082076f9f3d81a6b47a692c7263be5b85ff99d;p=thirdparty%2Fsamba.git

s3:smbd: remove one indentation level in close_directory()

We now use a goto done in order to skip the deletion part.

This means the code flow is now almost idential compared to
close_remove_share_mode().

It prepares to split common code to be shared by
close_remove_share_mode() and close_directory().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 79264c74e81..a120f02e90d 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1442,63 +1442,66 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
 		delete_dir = false;
 	}
 
-	if (delete_dir) {
+	if (!delete_dir) {
+		status = NT_STATUS_OK;
+		goto done;
+	}
 
-		/*
-		 * Ok, we have to delete the directory
-		 */
+	/*
+	 * Ok, we have to delete the directory
+	 */
 
-		DBG_INFO("dir %s. Delete on close was set - deleting directory.\n",
-			 fsp_str_dbg(fsp));
+	DBG_INFO("dir %s. Delete on close was set - deleting directory.\n",
+		 fsp_str_dbg(fsp));
 
-		got_tokens = get_delete_on_close_token(lck, fsp->name_hash,
-						&del_nt_token, &del_token);
-		SMB_ASSERT(got_tokens);
+	got_tokens = get_delete_on_close_token(lck, fsp->name_hash,
+					&del_nt_token, &del_token);
+	SMB_ASSERT(got_tokens);
 
-		/* Become the user who requested the delete. */
+	/* Become the user who requested the delete. */
 
-		if (!push_sec_ctx()) {
-			smb_panic("close_directory: failed to push sec_ctx.\n");
-		}
+	if (!push_sec_ctx()) {
+		smb_panic("close_directory: failed to push sec_ctx.\n");
+	}
 
-		set_sec_ctx(del_token->uid,
-				del_token->gid,
-				del_token->ngroups,
-				del_token->groups,
-				del_nt_token);
+	set_sec_ctx(del_token->uid,
+			del_token->gid,
+			del_token->ngroups,
+			del_token->groups,
+			del_nt_token);
 
-		if ((fsp->conn->fs_capabilities & FILE_NAMED_STREAMS)
-		    && !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
+	if ((fsp->conn->fs_capabilities & FILE_NAMED_STREAMS)
+	    && !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
 
-			status = delete_all_streams(fsp->conn, fsp->fsp_name);
-			if (!NT_STATUS_IS_OK(status)) {
-				DEBUG(5, ("delete_all_streams failed: %s\n",
-					  nt_errstr(status)));
-				/* unbecome user. */
-				pop_sec_ctx();
-				return status;
-			}
+		status = delete_all_streams(fsp->conn, fsp->fsp_name);
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(5, ("delete_all_streams failed: %s\n",
+				  nt_errstr(status)));
+			/* unbecome user. */
+			pop_sec_ctx();
+			return status;
 		}
+	}
 
-		status = rmdir_internals(talloc_tos(), fsp);
+	status = rmdir_internals(talloc_tos(), fsp);
 
-		DEBUG(5,("close_directory: %s. Delete on close was set - "
-			 "deleting directory returned %s.\n",
-			 fsp_str_dbg(fsp), nt_errstr(status)));
+	DEBUG(5,("close_directory: %s. Delete on close was set - "
+		 "deleting directory returned %s.\n",
+		 fsp_str_dbg(fsp), nt_errstr(status)));
 
-		/* unbecome user. */
-		pop_sec_ctx();
+	/* unbecome user. */
+	pop_sec_ctx();
 
-		/*
-		 * Ensure we remove any change notify requests that would
-		 * now fail as the directory has been deleted.
-		 */
+	/*
+	 * Ensure we remove any change notify requests that would
+	 * now fail as the directory has been deleted.
+	 */
 
-		if (NT_STATUS_IS_OK(status)) {
-			notify_status = NT_STATUS_DELETE_PENDING;
-		}
+	if (NT_STATUS_IS_OK(status)) {
+		notify_status = NT_STATUS_DELETE_PENDING;
 	}
 
+done:
 	if (!del_share_mode(lck, fsp)) {
 		DEBUG(0, ("close_directory: Could not delete share entry for "
 			  "%s\n", fsp_str_dbg(fsp)));