messaging: Avoid passing lp_ctx to tdb_wrap_open in messaging_tdb_parent_init

[kai/samba-autobuild/.git] / source3 / lib / messages_local.c

diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 295646a3a064db389246be09ffd7bd2959a201f9..1a3f3b27f24809ff1cabd95bd51b3f46738c681b 100644 (file)
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -174,6 +174,7 @@ bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx)
 {
        struct tdb_wrap *db;
        struct loadparm_context *lp_ctx;
+       const char *fname;
 
        lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers());
        if (lp_ctx == NULL) {
@@ -187,9 +188,12 @@ bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx)
         * work.
         */
 
-       db = tdb_wrap_open(mem_ctx, lock_path("messages.tdb"), 0,
-                          TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_VOLATILE|TDB_INCOMPATIBLE_HASH,
-                          O_RDWR|O_CREAT,0600, lp_ctx);
+       fname = lock_path("messages.tdb");
+       db = tdb_wrap_open_(
+               mem_ctx, fname, lpcfg_tdb_hash_size(lp_ctx, fname),
+               lpcfg_tdb_flags(lp_ctx, TDB_CLEAR_IF_FIRST|TDB_DEFAULT|
+                               TDB_VOLATILE|TDB_INCOMPATIBLE_HASH),
+               O_RDWR|O_CREAT,0600);
        talloc_unlink(mem_ctx, lp_ctx);
        if (db == NULL) {
                DEBUG(1, ("could not open messaging.tdb: %s\n",