s3:smbd: pass smbXsrv_connection to remove_deferred_open_message_smb()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 7626b58b0947035e990d25325cd3db165871b234..7cc26428345ceecc5d017d7d063a50186d3429f6 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2205,7 +2205,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        }
 
                        /* Ensure we don't reprocess this message. */
-                       remove_deferred_open_message_smb(req->sconn, req->mid);
+                       remove_deferred_open_message_smb(req->xconn, req->mid);
 
                        first_open_attempt = false;
                }

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 0ed78309be1be5aad8b723c497eaa33cceb2c876..048d4f8a58bded7440cb9cde5ba567ea0a4cfa56 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -692,7 +692,7 @@ static void smbd_deferred_open_timer(struct tevent_context *ev,
        /* If it's still there and was processed, remove it. */
        msg = get_deferred_open_message_smb(sconn, mid);
        if (msg && msg->processed) {
-               remove_deferred_open_message_smb(sconn, mid);
+               remove_deferred_open_message_smb(xconn, mid);
        }
 }
 
@@ -761,9 +761,10 @@ static bool push_queued_message(struct smb_request *req,
  Function to delete a sharing violation open message by mid.
 ****************************************************************************/
 
-void remove_deferred_open_message_smb(struct smbd_server_connection *sconn,
+void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
                                      uint64_t mid)
 {
+       struct smbd_server_connection *sconn = xconn->client->sconn;
        struct pending_message_list *pml;
 
        if (sconn->using_smb2) {

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 69e2ba45a143437f1f5a550d0aa6f5097ae6c71d..708f3892e1caa0eb796f755f22c9b25c1c11e227 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -749,7 +749,7 @@ int srv_set_message(char *buf,
                         int num_words,
                         int num_bytes,
                         bool zero);
-void remove_deferred_open_message_smb(struct smbd_server_connection *sconn,
+void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
                                      uint64_t mid);
 bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn,
                                        uint64_t mid);