summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 13:20:17 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:55 +0200
commit5d43180a550b7b4ad4613e99437cb92a1ef7ebd9 (patch)
treeea42f8c6d886585bcac53be10d71a3920181795e
parentf589909eb1ef6117007948f54c291775141be645 (diff)
downloadsamba-5d43180a550b7b4ad4613e99437cb92a1ef7ebd9.tar.gz
samba-5d43180a550b7b4ad4613e99437cb92a1ef7ebd9.tar.bz2
samba-5d43180a550b7b4ad4613e99437cb92a1ef7ebd9.zip
s3: Explicitly pass sconn to the remove_pending_change_notify_request_by_mid
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/smbd/notify.c4
-rw-r--r--source3/smbd/nttrans.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index dd3c2b2f1c..d263eab0b1 100644
--- 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 926bbb788b..dc13aadadd 100644
--- 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 eae4901603..fdee584282 100644
--- 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",