summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-12 15:45:07 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-12 20:14:41 +0100
commitd1e0997614ac76bf4d2efc59d9a49472a3da3d4c (patch)
tree04be36b427354097c2867b12feef566fbacf8437 /source3
parentf59d3586535252e7d3c1944bc827807be60692a6 (diff)
downloadsamba-d1e0997614ac76bf4d2efc59d9a49472a3da3d4c.tar.gz
samba-d1e0997614ac76bf4d2efc59d9a49472a3da3d4c.tar.bz2
samba-d1e0997614ac76bf4d2efc59d9a49472a3da3d4c.zip
s3:smbd/blocking: pass smbd_server_connection as private_data to received_unlock_msg()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/blocking.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index f07a79259f..5520feca5f 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -248,7 +248,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
/* Ensure we'll receive messages when this is unlocked. */
if (!sconn->smb1.locks.blocking_lock_unlock_state) {
- messaging_register(sconn->msg_ctx, NULL,
+ messaging_register(sconn->msg_ctx, sconn,
MSG_SMB_UNLOCK, received_unlock_msg);
sconn->smb1.locks.blocking_lock_unlock_state = true;
}
@@ -702,11 +702,11 @@ static void received_unlock_msg(struct messaging_context *msg,
struct server_id server_id,
DATA_BLOB *data)
{
- struct smbd_server_connection *sconn;
+ struct smbd_server_connection *sconn =
+ talloc_get_type(private_data,
+ struct smbd_server_connection);
- sconn = msg_ctx_to_sconn(msg);
if (sconn == NULL) {
- DEBUG(1, ("could not find sconn\n"));
return;
}