[SCM] Samba Shared Repository - branch v4-2-test updated

[Karolin Seeger]

The branch, v4-2-test has been updated
       via  4759f64 smbd: Fix an assert
      from  0ab3ef3 s3: auth: Move the declaration of struct dom_sid tmp_sid to function level scope.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 4759f64e94e01e32b36f048d20bf4c94e4398ef3
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 20 13:13:38 2016 +0200

    smbd: Fix an assert
    
    This might stumble over stale entries
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11844
    
    Autobuild-User(v4-2-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-2-test): Thu Jun  2 15:08:18 CEST 2016 on sn-devel-104

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

Summary of changes:
 source3/smbd/oplock.c | 1 +
 1 file changed, 1 insertion(+)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index f50d3b9..9996b8b 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -190,6 +190,7 @@ bool update_num_read_oplocks(files_struct *fsp, struct share_mode_lock *lck)
 		/*
 		 * If we're the only one, we don't need a brlock entry
 		 */
+		remove_stale_share_mode_entries(d);
 		SMB_ASSERT(d->num_share_modes == 1);
 		SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type));
 		return true;


-- 
Samba Shared Repository