From 3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 13 Oct 2011 20:01:56 +1100 Subject: s4-messaging: Pass the loadparm context, not just the messaging path This will allow the TDB layer to get at the lp_ctx for tdb options. Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/ridalloc.c | 2 +- source4/dsdb/samdb/ldb_modules/rootdse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/samdb/ldb_modules') diff --git a/source4/dsdb/samdb/ldb_modules/ridalloc.c b/source4/dsdb/samdb/ldb_modules/ridalloc.c index ed87f86fa2..2cef1c445f 100644 --- a/source4/dsdb/samdb/ldb_modules/ridalloc.c +++ b/source4/dsdb/samdb/ldb_modules/ridalloc.c @@ -73,7 +73,7 @@ static void ridalloc_poke_rid_manager(struct ldb_module *module) (struct loadparm_context *)ldb_get_opaque(ldb, "loadparm"); TALLOC_CTX *tmp_ctx = talloc_new(module); - msg = imessaging_client_init(tmp_ctx, lpcfg_imessaging_path(tmp_ctx, lp_ctx), + msg = imessaging_client_init(tmp_ctx, lp_ctx, ldb_get_event_context(ldb)); if (!msg) { DEBUG(3,(__location__ ": Failed to create messaging context\n")); diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index 9813fe8b07..46dbb75b37 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -1299,7 +1299,7 @@ static int rootdse_become_master(struct ldb_module *module, "RODC cannot become a role master."); } - msg = imessaging_client_init(tmp_ctx, lpcfg_imessaging_path(tmp_ctx, lp_ctx), + msg = imessaging_client_init(tmp_ctx, lp_ctx, ldb_get_event_context(ldb)); if (!msg) { ldb_asprintf_errstring(ldb, "Failed to generate client messaging context in %s", lpcfg_imessaging_path(tmp_ctx, lp_ctx)); -- cgit