From: Volker Lendecke <vl@samba.org>
Date: Mon, 6 Feb 2023 20:36:51 +0000 (+0100)
Subject: smbd: Remove dptr_struct->spid
X-Git-Tag: talloc-2.4.1~1618
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a49edcd0d26058e41712e3d069bfe36a463b76dc;p=thirdparty%2Fsamba.git

smbd: Remove dptr_struct->spid

This was only set but never read

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index db940161e1a..dd968420007 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -67,7 +67,6 @@ struct smb_Dir {
 struct dptr_struct {
 	struct dptr_struct *next, *prev;
 	int dnum;
-	uint16_t spid;
 	struct connection_struct *conn;
 	struct smb_Dir *dir_hnd;
 	bool expect_close;
@@ -211,7 +210,6 @@ NTSTATUS dptr_create(connection_struct *conn,
 		files_struct *fsp,
 		bool old_handle,
 		bool expect_close,
-		uint16_t spid,
 		const char *wcard,
 		uint32_t attr,
 		struct dptr_struct **dptr_ret)
@@ -252,7 +250,6 @@ NTSTATUS dptr_create(connection_struct *conn,
 
 	dptr->conn = conn;
 	dptr->dir_hnd = dir_hnd;
-	dptr->spid = spid;
 	dptr->expect_close = expect_close;
 	dptr->wcard = talloc_strdup(dptr, wcard);
 	if (!dptr->wcard) {
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 32e5c33896b..7e7569feb5d 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -188,7 +188,6 @@ NTSTATUS dptr_create(connection_struct *conn,
 		files_struct *fsp,
 		bool old_handle,
 		bool expect_close,
-		uint16_t spid,
 		const char *wcard,
 		uint32_t attr,
 		struct dptr_struct **dptr_ret);
diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index de6b4d99f79..b3477ba812b 100644
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -1180,7 +1180,6 @@ void reply_search(struct smb_request *req)
 					fsp, /* fsp */
 					True,
 					expect_close,
-					req->smbpid,
 					mask,
 					dirtype,
 					&fsp->dptr);
diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 336024c9456..cb392810a57 100644
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -1060,7 +1060,6 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				fsp, /* fsp */
 				False,
 				True,
-				req->smbpid,
 				mask,
 				dirtype,
 				&fsp->dptr);
diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 2d58741738c..0d6fb11f9a8 100644
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -427,7 +427,6 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
 				     fsp,
 				     false, /* old_handle */
 				     false, /* expect_close */
-				     0, /* spid */
 				     state->in_file_name, /* wcard */
 				     state->dirtype,
 				     &fsp->dptr);