1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00

smbXsrv_client: make sure we only wait for smb2srv_client_mc_negprot_filter once and only when needed

This will simplify the following changes...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15200

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 8c8d8cf01e01c2726d03fa1c81e0ce9992ee736c)
This commit is contained in:
Stefan Metzmacher 2022-10-12 14:15:53 +02:00 committed by Jule Anger
parent 935f1ec476
commit 0fa03f112f

View File

@ -462,6 +462,7 @@ struct smb2srv_client_mc_negprot_state {
struct tevent_context *ev;
struct smbd_smb2_request *smb2req;
struct db_record *db_rec;
struct tevent_req *filter_subreq;
};
static void smb2srv_client_mc_negprot_cleanup(struct tevent_req *req,
@ -519,6 +520,7 @@ static void smb2srv_client_mc_negprot_next(struct tevent_req *req)
struct tevent_req *subreq = NULL;
NTSTATUS status;
TALLOC_FREE(state->filter_subreq);
SMB_ASSERT(state->db_rec == NULL);
state->db_rec = smbXsrv_client_global_fetch_locked(table->global.db_ctx,
&client_guid,
@ -590,6 +592,7 @@ static void smb2srv_client_mc_negprot_next(struct tevent_req *req)
return;
}
tevent_req_set_callback(subreq, smb2srv_client_mc_negprot_done, req);
state->filter_subreq = subreq;
}
if (procid_is_local(&global->server_id)) {
@ -650,6 +653,9 @@ static void smb2srv_client_mc_negprot_done(struct tevent_req *subreq)
NTSTATUS status;
int ret;
SMB_ASSERT(state->filter_subreq == subreq);
state->filter_subreq = NULL;
ret = messaging_filtered_read_recv(subreq, state, &rec);
TALLOC_FREE(subreq);
if (ret != 0) {