[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  b208499 gencache: Bail out of stabilize if we can not get the allrecord lock
      from  70e2418 s3/smbd: use correct talloc memory context for tevent subrequests

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


- Log -----------------------------------------------------------------
commit b208499960eefef02d305a3bd59b03a7c2aafcac
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 19 14:29:21 2016 -0700

    gencache: Bail out of stabilize if we can not get the allrecord lock
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12045
    
    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): Tue Sep 20 04:09:33 CEST 2016 on sn-devel-144

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

Summary of changes:
 source3/lib/gencache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 5af6eb8..b5fed3d 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -655,7 +655,7 @@ bool gencache_stabilize(void)
 		return false;
 	}
 
-	res = tdb_lockall(cache_notrans->tdb);
+	res = tdb_lockall_nonblock(cache_notrans->tdb);
 	if (res != 0) {
 		tdb_transaction_cancel(cache->tdb);
 		DEBUG(10, ("Could not get allrecord lock on "


-- 
Samba Shared Repository