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/dbwrap/dbwrap_open.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/dbwrap/dbwrap_open.c') diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index e5adab7eaa..515b4bff1d 100644 --- a/source3/lib/dbwrap/dbwrap_open.c +++ b/source3/lib/dbwrap/dbwrap_open.c @@ -118,7 +118,7 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, #endif if (result == NULL) { - struct loadparm_context *lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_context()); + struct loadparm_context *lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers()); result = dbwrap_local_open(mem_ctx, lp_ctx, name, hash_size, tdb_flags, open_flags, mode, lock_order); -- cgit