From: Jeremy Allison <jra@samba.org>
Date: Fri, 1 May 2020 17:09:53 +0000 (-0700)
Subject: s3: smbd: Reformat users of smbd_calculate_access_mask().
X-Git-Tag: ldb-2.2.0~763
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7144b7acd298b2fd06cbe02f163bb905eca450a;p=thirdparty%2Fsamba.git

s3: smbd: Reformat users of smbd_calculate_access_mask().

Make new parameter addition clearer.

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

diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c
index 625c21ff8bd..9a87bad4812 100644
--- a/source3/smbd/fake_file.c
+++ b/source3/smbd/fake_file.c
@@ -131,8 +131,11 @@ NTSTATUS open_fake_file(struct smb_request *req, connection_struct *conn,
 	files_struct *fsp = NULL;
 	NTSTATUS status;
 
-	status = smbd_calculate_access_mask(conn, smb_fname, false,
-					    access_mask, &access_mask);
+	status = smbd_calculate_access_mask(conn,
+					smb_fname,
+					false,
+					access_mask,
+					&access_mask);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(10, ("open_fake_file: smbd_calculate_access_mask "
 			"on service[%s] file[%s] returned %s\n",
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index cbd66e99ac8..68a39e277fc 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -212,10 +212,10 @@ NTSTATUS smbd_dirptr_lanman2_entry(TALLOC_CTX *ctx,
 			       struct file_id *file_id);
 
 NTSTATUS smbd_calculate_access_mask(connection_struct *conn,
-				    const struct smb_filename *smb_fname,
-				    bool use_privs,
-				    uint32_t access_mask,
-				    uint32_t *access_mask_out);
+			const struct smb_filename *smb_fname,
+			bool use_privs,
+			uint32_t access_mask,
+			uint32_t *access_mask_out);
 
 void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq);
 
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 2fd79b426de..2e32062dbbf 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -397,7 +397,8 @@ static NTSTATUS check_base_file_access(struct connection_struct *conn,
 {
 	NTSTATUS status;
 
-	status = smbd_calculate_access_mask(conn, smb_fname,
+	status = smbd_calculate_access_mask(conn,
+					smb_fname,
 					false,
 					access_mask,
 					&access_mask);
@@ -3101,10 +3102,10 @@ static NTSTATUS smbd_calculate_maximum_allowed_access(
 }
 
 NTSTATUS smbd_calculate_access_mask(connection_struct *conn,
-				    const struct smb_filename *smb_fname,
-				    bool use_privs,
-				    uint32_t access_mask,
-				    uint32_t *access_mask_out)
+			const struct smb_filename *smb_fname,
+			bool use_privs,
+			uint32_t access_mask,
+			uint32_t *access_mask_out)
 {
 	NTSTATUS status;
 	uint32_t orig_access_mask = access_mask;
@@ -3505,10 +3506,11 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 		}
 	}
 
-	status = smbd_calculate_access_mask(conn, smb_fname,
+	status = smbd_calculate_access_mask(conn,
+					smb_fname,
 					false,
 					access_mask,
-					&access_mask); 
+					&access_mask);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(10, ("open_file_ntcreate: smbd_calculate_access_mask "
 			"on file %s returned %s\n",
@@ -4263,8 +4265,11 @@ static NTSTATUS open_directory(connection_struct *conn,
 		 create_disposition,
 		 file_attributes);
 
-	status = smbd_calculate_access_mask(conn, smb_dname, false,
-					    access_mask, &access_mask);
+	status = smbd_calculate_access_mask(conn,
+					smb_dname,
+					false,
+					access_mask,
+					&access_mask);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(10, ("open_directory: smbd_calculate_access_mask "
 			"on file %s returned %s\n",
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 2221c4c7d0d..5fad0640ef4 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1341,10 +1341,10 @@ static void smbd_smb2_create_after_exec(struct tevent_req *req)
 			DATA_BLOB blob = data_blob_const(p, sizeof(p));
 
 			status = smbd_calculate_access_mask(smb1req->conn,
-							    state->result->fsp_name,
-							    false,
-							    SEC_FLAG_MAXIMUM_ALLOWED,
-							    &max_access_granted);
+					state->result->fsp_name,
+					false,
+					SEC_FLAG_MAXIMUM_ALLOWED,
+					&max_access_granted);
 
 			SIVAL(p, 0, NT_STATUS_V(status));
 			SIVAL(p, 4, max_access_granted);