diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-12 14:16:39 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-12 15:42:56 +0200 |
| commit | bfd5f24fa1a9b8914ac81161b4612bdcfd408174 (patch) | |
| tree | 2017f076b7eac4ade9c1492070ee8cd7ddd465d9 | |
| parent | 6b8db9b215395c41aa5cd18a3a6109f6aaca242a (diff) | |
| download | samba-bfd5f24fa1a9b8914ac81161b4612bdcfd408174.tar.gz samba-bfd5f24fa1a9b8914ac81161b4612bdcfd408174.tar.bz2 samba-bfd5f24fa1a9b8914ac81161b4612bdcfd408174.zip | |
s3: Remove smbd_server_conn from brl_timeout_fn
| -rw-r--r-- | source3/smbd/blocking.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index f2ef4b2aa9..bedec9aab9 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -39,7 +39,8 @@ void brl_timeout_fn(struct event_context *event_ctx, struct timeval now, void *private_data) { - struct smbd_server_connection *sconn = smbd_server_conn; + struct smbd_server_connection *sconn = talloc_get_type_abort( + private_data, struct smbd_server_connection); if (sconn->using_smb2) { SMB_ASSERT(sconn->smb2.locks.brl_timeout == te); @@ -138,9 +139,10 @@ static bool recalc_brl_timeout(void) (int)from_now.tv_sec, (int)from_now.tv_usec)); } - if (!(sconn->smb1.locks.brl_timeout = event_add_timed(smbd_event_context(), NULL, - next_timeout, - brl_timeout_fn, NULL))) { + sconn->smb1.locks.brl_timeout = event_add_timed(smbd_event_context(), + NULL, next_timeout, + brl_timeout_fn, sconn); + if (sconn->smb1.locks.brl_timeout == NULL) { return False; } |