From: Jeremy Allison <jra@samba.org>
Date: Wed, 25 Mar 2020 20:42:34 +0000 (-0700)
Subject: s3: smbd: Reformatting callers of rename_internals_fsp() to make it easer to see... 
X-Git-Tag: ldb-2.2.0~1155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=614b3003017657e8a6268d3cf73513ab557ed4b2;p=thirdparty%2Fsamba.git

s3: smbd: Reformatting callers of rename_internals_fsp() to make it easer to see changed parameters.

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

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 58bc7d05eab..cea2334ca73 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8061,8 +8061,11 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
 			goto out;
 		}
 
-		status = rename_internals_fsp(conn, fsp, smb_fname_dst,
-					      attrs, replace_if_exists);
+		status = rename_internals_fsp(conn,
+					fsp,
+					smb_fname_dst,
+					attrs,
+					replace_if_exists);
 
 		close_file(req, fsp, NORMAL_CLOSE);
 
@@ -8229,8 +8232,11 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
 			goto out;
 		}
 
-		status = rename_internals_fsp(conn, fsp, smb_fname_dst,
-					      attrs, replace_if_exists);
+		status = rename_internals_fsp(conn,
+					fsp,
+					smb_fname_dst,
+					attrs,
+					replace_if_exists);
 
 		close_file(req, fsp, NORMAL_CLOSE);
 
@@ -8379,9 +8385,16 @@ void reply_mv(struct smb_request *req)
 	DEBUG(3,("reply_mv : %s -> %s\n", smb_fname_str_dbg(smb_fname_src),
 		 smb_fname_str_dbg(smb_fname_dst)));
 
-	status = rename_internals(ctx, conn, req, smb_fname_src, smb_fname_dst,
-				  attrs, False, src_has_wcard, dest_has_wcard,
-				  DELETE_ACCESS);
+	status = rename_internals(ctx,
+				conn,
+				req,
+				smb_fname_src,
+				smb_fname_dst,
+				attrs,
+				false,
+				src_has_wcard,
+				dest_has_wcard,
+				DELETE_ACCESS);
 	if (!NT_STATUS_IS_OK(status)) {
 		if (open_was_deferred(req->xconn, req->mid)) {
 			/* We have re-scheduled this call. */
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2e58e1f4c85..0fb2284be36 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7174,7 +7174,9 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
 		  "SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
 		  fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
 		  smb_fname_str_dbg(smb_fname_dst)));
-	status = rename_internals_fsp(conn, fsp, smb_fname_dst,
+	status = rename_internals_fsp(conn,
+				fsp,
+				smb_fname_dst,
 				(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM),
 				overwrite);
 
@@ -7444,17 +7446,26 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
 			  "SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
 			  fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
 			  smb_fname_str_dbg(smb_fname_dst)));
-		status = rename_internals_fsp(conn, fsp, smb_fname_dst, 0,
-					      overwrite);
+		status = rename_internals_fsp(conn,
+					fsp,
+					smb_fname_dst,
+					0,
+					overwrite);
 	} else {
 		DEBUG(10,("smb_file_rename_information: "
 			  "SMB_FILE_RENAME_INFORMATION %s -> %s\n",
 			  smb_fname_str_dbg(smb_fname_src),
 			  smb_fname_str_dbg(smb_fname_dst)));
-		status = rename_internals(ctx, conn, req, smb_fname_src,
-					  smb_fname_dst, 0, overwrite, false,
-					  dest_has_wcard,
-					  FILE_WRITE_ATTRIBUTES);
+		status = rename_internals(ctx,
+					conn,
+					req,
+					smb_fname_src,
+					smb_fname_dst,
+					0,
+					overwrite,
+					false,
+					dest_has_wcard,
+					FILE_WRITE_ATTRIBUTES);
 	}
  out:
 	TALLOC_FREE(smb_fname_dst);