summaryrefslogtreecommitdiffstats
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-12-05 15:50:58 +0100
committerJeremy Allison <jra@samba.org>2013-12-05 21:21:35 +0100
commitc1b7cf5481f20e7503e736ac2edd4c6d47dfea1c (patch)
treeca5d0f348ea6590250a7e51f06c010415e6f32b8 /source3/smbd
parent48f426b22de563f62c39a7aead47c53b7f7c578c (diff)
downloadsamba-c1b7cf5481f20e7503e736ac2edd4c6d47dfea1c.tar.gz
samba-c1b7cf5481f20e7503e736ac2edd4c6d47dfea1c.tar.xz
samba-c1b7cf5481f20e7503e736ac2edd4c6d47dfea1c.zip
smbd: Fix a panic when a smb2 brlock times out
Found by Peter Somogyi. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Dec 5 21:21:35 CET 2013 on sn-devel-104
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/smb2_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index e2ea2512c6..671cd6f066 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -511,7 +511,7 @@ static bool recalc_smb2_brl_timeout(struct smbd_server_connection *sconn)
NULL,
next_timeout,
brl_timeout_fn,
- NULL);
+ sconn);
if (!sconn->smb2.locks.brl_timeout) {
return false;
}