From 666dba33531c7e7d391318c915fb393ec5b1da36 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 27 Jun 2012 23:24:39 +1000 Subject: s3-param: Rename loadparm_s3_context -> loadparm_s3_helpers This helps clarify the role of this structure and wrapper function. The purpose here is to provide helper functions to the lib/param loadparm_context that point back at the s3 lp_ functions. This allows a struct loadparm_context to be passed to any point in the code, and always refer to the correct loadparm system. If this has not been set, the variables loaded in the lib/param code will be returned. As requested by Michael Adam. Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Jun 27 17:11:16 CEST 2012 on sn-devel-104 --- source3/lib/messages_local.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/messages_local.c') diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c index 74b6a13764..6b63d72925 100644 --- a/source3/lib/messages_local.c +++ b/source3/lib/messages_local.c @@ -104,7 +104,7 @@ NTSTATUS messaging_tdb_init(struct messaging_context *msg_ctx, return NT_STATUS_NO_MEMORY; } - lp_ctx = loadparm_init_s3(result, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(result, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(0, ("loadparm_init_s3 failed\n")); return NT_STATUS_INTERNAL_ERROR; @@ -158,7 +158,7 @@ bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx) struct tdb_wrap *db; struct loadparm_context *lp_ctx; - lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(0, ("loadparm_init_s3 failed\n")); return false; -- cgit