s3: Explicitly pass sconn to the remove_pending_change_notify_request_by_mid

diff --git a/source3/include/proto.h b/source3/include/proto.h
index dd3c2b2f1c4e68611aa5edd007ae5f904e703693..d263eab0b108d01f731a637a663219f89cd6ad62 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5786,7 +5786,8 @@ NTSTATUS change_notify_add_request(struct smb_request *req,
                                void (*reply_fn)(struct smb_request *req,
                                        NTSTATUS error_code,
                                        uint8_t *buf, size_t len));
-void remove_pending_change_notify_requests_by_mid(uint64_t mid);
+void remove_pending_change_notify_requests_by_mid(
+       struct smbd_server_connection *sconn, uint64_t mid);
 void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
                                                  NTSTATUS status);
 void notify_fname(connection_struct *conn, uint32 action, uint32 filter,

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 926bbb788bab72a0f7537113becdae1520d37a79..dc13aadadd707c665e97fea8a1b3e7dff1a7bffd 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -297,10 +297,10 @@ static void change_notify_remove_request(struct smbd_server_connection *sconn,
  Delete entries by mid from the change notify pending queue. Always send reply.
 *****************************************************************************/
 
-void remove_pending_change_notify_requests_by_mid(uint64_t mid)
+void remove_pending_change_notify_requests_by_mid(
+       struct smbd_server_connection *sconn, uint64_t mid)
 {
        struct notify_mid_map *map;
-       struct smbd_server_connection *sconn = smbd_server_conn;
 
        for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
                if (map->mid == mid) {

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index eae4901603bc6a4add18c93aefad806402ff0b5c..fdee584282532bc2475f8f535b21c175922911f7 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1278,7 +1278,7 @@ void reply_ntcancel(struct smb_request *req)
 
        START_PROFILE(SMBntcancel);
        srv_cancel_sign_response(req->sconn);
-       remove_pending_change_notify_requests_by_mid(req->mid);
+       remove_pending_change_notify_requests_by_mid(req->sconn, req->mid);
        remove_pending_lock_requests_by_mid_smb1(req->mid);
 
        DEBUG(3,("reply_ntcancel: cancel called on mid = %llu.\n",