git.samba.org
/
mat
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f59d358
)
s3:smbd/blocking: pass smbd_server_connection as private_data to received_unlock_msg()
author
Stefan Metzmacher
<metze@samba.org>
Mon, 12 Dec 2011 14:45:07 +0000
(15:45 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Mon, 12 Dec 2011 19:14:41 +0000
(20:14 +0100)
metze
source3/smbd/blocking.c
patch
|
blob
|
history
diff --git
a/source3/smbd/blocking.c
b/source3/smbd/blocking.c
index f07a79259fcd821b3d03a919549e9fad588e45fb..5520feca5f11910bada3cf11a4930158fbf82909 100644
(file)
--- 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) {
/* 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;
}
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 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) {
if (sconn == NULL) {
- DEBUG(1, ("could not find sconn\n"));
return;
}
return;
}