diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-27 23:24:39 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-27 17:11:16 +0200 |
| commit | 666dba33531c7e7d391318c915fb393ec5b1da36 (patch) | |
| tree | cf5b864e6607487b4487ee5df7de2484e8d59b3b /source3/lib/dbwrap | |
| parent | 7e8ed7d68dc48dd283df649c3f75d5679f7beae9 (diff) | |
| download | samba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.gz samba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.bz2 samba-666dba33531c7e7d391318c915fb393ec5b1da36.zip | |
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 <abartlet@samba.org>
Autobuild-Date(master): Wed Jun 27 17:11:16 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/lib/dbwrap')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 2 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 7bb206bea5..1062cb0bbd 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1583,7 +1583,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, return NULL; } - lp_ctx = loadparm_init_s3(db_path, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(db_path, loadparm_s3_helpers()); db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, O_RDWR, 0, lp_ctx); 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); |