diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-12 14:48:42 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-12 15:42:57 +0200 |
| commit | 375ce3c96a695f447a09a8414735249e16cc7916 (patch) | |
| tree | b9e280936392673d0f1505b0657704655342ac74 | |
| parent | 9747eb45d606222b8a8361a9e0a3d878b063551a (diff) | |
| download | samba-375ce3c96a695f447a09a8414735249e16cc7916.tar.gz samba-375ce3c96a695f447a09a8414735249e16cc7916.tar.bz2 samba-375ce3c96a695f447a09a8414735249e16cc7916.zip | |
s3: Explicitly pass sconn to [remove|schedule]_deferred_open_message_smb2
| -rw-r--r-- | source3/smbd/globals.h | 6 | ||||
| -rw-r--r-- | source3/smbd/process.c | 4 | ||||
| -rw-r--r-- | source3/smbd/smb2_create.c | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 1a87238d1d..4f698f8717 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -328,8 +328,10 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req, void **pp_state); bool open_was_deferred_smb2(struct smbd_server_connection *sconn, uint64_t mid); -void remove_deferred_open_message_smb2(uint64_t mid); -void schedule_deferred_open_message_smb2(uint64_t mid); +void remove_deferred_open_message_smb2( + struct smbd_server_connection *sconn, uint64_t mid); +void schedule_deferred_open_message_smb2( + struct smbd_server_connection *sconn, uint64_t mid); bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req, struct timeval request_time, struct timeval timeout, diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 528c805c48..3c44cca5fd 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -610,7 +610,7 @@ void remove_deferred_open_message_smb(uint64_t mid) struct pending_message_list *pml; if (smbd_server_conn->using_smb2) { - remove_deferred_open_message_smb2(mid); + remove_deferred_open_message_smb2(smbd_server_conn, mid); return; } @@ -638,7 +638,7 @@ void schedule_deferred_open_message_smb(uint64_t mid) int i = 0; if (smbd_server_conn->using_smb2) { - schedule_deferred_open_message_smb2(mid); + schedule_deferred_open_message_smb2(smbd_server_conn, mid); return; } diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 98c5838000..60bbde215d 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -995,11 +995,12 @@ static void remove_deferred_open_message_smb2_internal(struct smbd_smb2_request TALLOC_FREE(state->im); } -void remove_deferred_open_message_smb2(uint64_t mid) +void remove_deferred_open_message_smb2( + struct smbd_server_connection *sconn, uint64_t mid) { struct smbd_smb2_request *smb2req; - smb2req = find_open_smb2req(smbd_server_conn, mid); + smb2req = find_open_smb2req(sconn, mid); if (!smb2req) { DEBUG(10,("remove_deferred_open_message_smb2: " @@ -1031,12 +1032,13 @@ static void smbd_smb2_create_request_dispatch_immediate(struct tevent_context *c } } -void schedule_deferred_open_message_smb2(uint64_t mid) +void schedule_deferred_open_message_smb2( + struct smbd_server_connection *sconn, uint64_t mid) { struct smbd_smb2_create_state *state = NULL; struct smbd_smb2_request *smb2req; - smb2req = find_open_smb2req(smbd_server_conn, mid); + smb2req = find_open_smb2req(sconn, mid); if (!smb2req) { DEBUG(10,("schedule_deferred_open_message_smb2: " |