[Pkg-samba-maint] [samba] 123/135: smbd: Fix a panic when a smb2 brlock times out

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit a15ca71073312def76c3c15429bb9c29f33078f2
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Dec 5 15:50:58 2013 +0100

    smbd: Fix a panic when a smb2 brlock times out
    
    Found by Peter Somogyi.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at 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.
---
 source3/smbd/smb2_lock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index e2ea251..671cd6f 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;
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git