s3: Pass down lock_order to db_open_ctdb

[metze/samba/wip.git] / source3 / lib / dbwrap / dbwrap_open.c

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index 23d299511b4e245e4c1a73acbb1a3e52a87a96dc..731529680e454a1b6f53069a388b6efdd1a192ba 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -106,7 +106,8 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
                /* allow ctdb for individual databases to be disabled */
                if (lp_parm_bool(-1, "ctdb", partname, True)) {
                        result = db_open_ctdb(mem_ctx, partname, hash_size,
-                                             tdb_flags, open_flags, mode);
+                                             tdb_flags, open_flags, mode,
+                                             lock_order);
                        if (result == NULL) {
                                DEBUG(0,("failed to attach to ctdb %s\n",
                                         partname));
@@ -124,5 +125,8 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
                result = db_open_tdb(mem_ctx, name, hash_size,
                                     tdb_flags, open_flags, mode);
        }
+       if (result != NULL) {
+               result->lock_order = lock_order;
+       }
        return result;
 }