[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  c1b7cf5 smbd: Fix a panic when a smb2 brlock times out
      from  48f426b smbtorture: New torture test for bug #9870.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c1b7cf5481f20e7503e736ac2edd4c6d47dfea1c
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

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/smb2_lock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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;
 	}


-- 
Samba Shared Repository