s3: Explicitly pass sconn to [remove|schedule]_deferred_open_message_smb2

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 1a87238d1d26e6e4fc89b148995ac3d07df98e9a..4f698f8717e43d28347d6d24e013c12c09bc93f0 100644 (file)
--- 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 528c805c48b6b30a9c6acdf8f51b12d45ab60271..3c44cca5fd9b0de4fd0b45c8dc29a31c76fb1393 100644 (file)
--- 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 98c583800062b904789d917d2327ae153b395231..60bbde215d03360e5d3bd85ed58d48e694cf0832 100644 (file)
--- 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: "