sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

smbd: Remove dptr_struct->expect_close

Browse Source 
This was only set but never read

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2023-02-06 21:40:38 +01:00 committed by Jeremy Allison
parent a49edcd0d2
commit 1a040c7f7e
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/smbd/dir.c
View File

@ -69,7 +69,6 @@ struct dptr_struct {
int dnum;
struct connection_struct *conn;
struct smb_Dir *dir_hnd;
bool expect_close;
char *wcard;
uint32_t attr;
bool has_wild; /* Set to true if the wcard entry has MS wildcard characters in it. */
@ -209,7 +208,6 @@ NTSTATUS dptr_create(connection_struct *conn,
struct smb_request *req,
files_struct *fsp,
bool old_handle,
bool expect_close,
const char *wcard,
uint32_t attr,
struct dptr_struct **dptr_ret)
@ -250,7 +248,6 @@ NTSTATUS dptr_create(connection_struct *conn,
dptr->conn = conn;
dptr->dir_hnd = dir_hnd;
dptr->expect_close = expect_close;
dptr->wcard = talloc_strdup(dptr, wcard);
if (!dptr->wcard) {
TALLOC_FREE(dptr);
@ -312,8 +309,8 @@ NTSTATUS dptr_create(connection_struct *conn,
DLIST_ADD(sconn->searches.dirptrs, dptr);
done:
DBG_INFO("creating new dirptr [%d] for path [%s], expect_close = %d\n",
dptr->dnum, fsp_str_dbg(fsp), expect_close);
DBG_INFO("creating new dirptr [%d] for path [%s]\n",
dptr->dnum, fsp_str_dbg(fsp));
*dptr_ret = dptr;

1
source3/smbd/proto.h
View File

@ -187,7 +187,6 @@ NTSTATUS dptr_create(connection_struct *conn,
struct smb_request *req,
files_struct *fsp,
bool old_handle,
bool expect_close,
const char *wcard,
uint32_t attr,
struct dptr_struct **dptr_ret);

1
source3/smbd/smb1_reply.c
View File

@ -1179,7 +1179,6 @@ void reply_search(struct smb_request *req)
NULL, /* req */
fsp, /* fsp */
True,
expect_close,
mask,
dirtype,
&fsp->dptr);

1
source3/smbd/smb1_trans2.c
View File

@ -1059,7 +1059,6 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
req,
fsp, /* fsp */
False,
True,
mask,
dirtype,
&fsp->dptr);

1
source3/smbd/smb2_query_directory.c
View File

@ -426,7 +426,6 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
NULL, /* req */
fsp,
false, /* old_handle */
false, /* expect_close */
state->in_file_name, /* wcard */
state->dirtype,
&fsp->dptr);