[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1106ede dbwrap_ctdb: Pass on mutex flags to tdb_open
      from  07d03e2 s3:lib: fix const warnings in popt_common.c

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


- Log -----------------------------------------------------------------
commit 1106ede280938d05325baa146bd524aa3568deaf
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 6 11:59:34 2014 +0100

    dbwrap_ctdb: Pass on mutex flags to tdb_open
    
    Without this, ctdb can create a tdb file with mutex activated, but the
    local tdb_open will not open the tdb due to strict flags checks whether
    mutexes are possible.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10922
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Sun Nov 16 12:13:54 CET 2014 on sn-devel-104

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

Summary of changes:
 source3/lib/dbwrap/dbwrap_ctdb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 2aee435..e6dcc0e 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1607,7 +1607,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 	result->lock_order = lock_order;
 
 	/* only pass through specific flags */
-	tdb_flags &= TDB_SEQNUM|TDB_VOLATILE;
+	tdb_flags &= TDB_SEQNUM|TDB_VOLATILE|
+		TDB_MUTEX_LOCKING|TDB_CLEAR_IF_FIRST;
 
 	/* honor permissions if user has specified O_CREAT */
 	if (open_flags & O_CREAT) {


-- 
Samba Shared Repository