From bfd5f24fa1a9b8914ac81161b4612bdcfd408174 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 12 Jun 2010 14:16:39 +0200 Subject: s3: Remove smbd_server_conn from brl_timeout_fn --- source3/smbd/blocking.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source3') 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; } -- cgit