diff options
| -rw-r--r-- | source3/smbd/open.c | 6 | ||||
| -rw-r--r-- | source3/smbd/process.c | 3 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 7cc2642834..ccea1e9d71 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1583,7 +1583,7 @@ static bool request_timed_out(struct timeval request_time, } struct defer_open_state { - struct smbd_server_connection *sconn; + struct smbXsrv_connection *xconn; uint64_t mid; }; @@ -1624,7 +1624,7 @@ static void defer_open(struct share_mode_lock *lck, if (watch_state == NULL) { exit_server("talloc failed"); } - watch_state->sconn = req->sconn; + watch_state->xconn = req->xconn; watch_state->mid = req->mid; DEBUG(10, ("defering mid %llu\n", @@ -1672,7 +1672,7 @@ static void defer_open_done(struct tevent_req *req) DEBUG(10, ("scheduling mid %llu\n", (unsigned long long)state->mid)); - ret = schedule_deferred_open_message_smb(state->sconn, state->mid); + ret = schedule_deferred_open_message_smb(state->xconn, state->mid); SMB_ASSERT(ret); TALLOC_FREE(state); } diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 048d4f8a58..4da6b75862 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -790,9 +790,10 @@ void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn, schedule it for immediate processing. ****************************************************************************/ -bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn, +bool schedule_deferred_open_message_smb(struct smbXsrv_connection *xconn, uint64_t mid) { + struct smbd_server_connection *sconn = xconn->client->sconn; struct pending_message_list *pml; int i = 0; diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 708f3892e1..68c2da24bc 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -751,7 +751,7 @@ int srv_set_message(char *buf, bool zero); void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn, uint64_t mid); -bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn, +bool schedule_deferred_open_message_smb(struct smbXsrv_connection *xconn, uint64_t mid); bool open_was_deferred(struct smbXsrv_connection *xconn, uint64_t mid); bool get_deferred_open_message_state(struct smb_request *smbreq, |