summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-12-05 15:50:58 +0100
committerKarolin Seeger <kseeger@samba.org>2013-12-10 13:04:28 +0100
commita15ca71073312def76c3c15429bb9c29f33078f2 (patch)
tree4e6f665dafcf7f7cac529792d2aa68524c61bd4c /source3
parentc89fb8b37373efa620165df0092d0cbcb7a1052b (diff)
downloadsamba-a15ca71073312def76c3c15429bb9c29f33078f2.tar.gz
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 Fix bug #10311 - SMB2 server can panic when a smb2 brlock times out.
Diffstat (limited to 'source3')
-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;
}