From: Volker Lendecke <vl@samba.org>
Date: Fri, 23 Dec 2022 16:18:30 +0000 (+0100)
Subject: smbd: Fix setfileinfo profiling
X-Git-Tag: talloc-2.4.0~109
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6619b16fec717813df94c26296270eab96bc4dc8;p=thirdparty%2Fsamba.git

smbd: Fix setfileinfo profiling

This ran under setpathinfo profiling

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 29232e348de..78d1a131868 100644
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -2626,6 +2626,46 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 	return;
 }
 
+static void call_trans2setpathinfo(
+	connection_struct *conn,
+	struct smb_request *req,
+	char **pparams,
+	int total_params,
+	char **ppdata,
+	int total_data,
+	unsigned int max_data_bytes)
+{
+	call_trans2setfilepathinfo(
+		conn,
+		req,
+		TRANSACT2_SETPATHINFO,
+		pparams,
+		total_params,
+		ppdata,
+		total_data,
+		max_data_bytes);
+}
+
+static void call_trans2setfileinfo(
+	connection_struct *conn,
+	struct smb_request *req,
+	char **pparams,
+	int total_params,
+	char **ppdata,
+	int total_data,
+	unsigned int max_data_bytes)
+{
+	call_trans2setfilepathinfo(
+		conn,
+		req,
+		TRANSACT2_SETFILEINFO,
+		pparams,
+		total_params,
+		ppdata,
+		total_data,
+		max_data_bytes);
+}
+
 /****************************************************************************
  Reply to a TRANS2_MKDIR (make directory with extended attributes).
 ****************************************************************************/
@@ -3090,17 +3130,35 @@ static void handle_trans2(connection_struct *conn, struct smb_request *req,
 	}
 
 	case TRANSACT2_SETPATHINFO:
-	case TRANSACT2_SETFILEINFO:
 	{
 		START_PROFILE(Trans2_setpathinfo);
-		call_trans2setfilepathinfo(conn, req, state->call,
-					   &state->param, state->total_param,
-					   &state->data, state->total_data,
-					   state->max_data_return);
+		call_trans2setpathinfo(
+			conn,
+			req,
+			&state->param,
+			state->total_param,
+			&state->data,
+			state->total_data,
+			state->max_data_return);
 		END_PROFILE(Trans2_setpathinfo);
 		break;
 	}
 
+	case TRANSACT2_SETFILEINFO:
+	{
+		START_PROFILE(Trans2_setfileinfo);
+		call_trans2setfileinfo(
+			conn,
+			req,
+			&state->param,
+			state->total_param,
+			&state->data,
+			state->total_data,
+			state->max_data_return);
+		END_PROFILE(Trans2_setfileinfo);
+		break;
+	}
+
 	case TRANSACT2_FINDNOTIFYFIRST:
 	{
 		START_PROFILE(Trans2_findnotifyfirst);