diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:56:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:05 +0100 |
| commit | 51db4c3f3d81d1ed03beae6426786c843ac59807 (patch) | |
| tree | d85647baa9f9715657a900da164ea54dc07fd13f /source4/lib/dbwrap | |
| parent | f4a1083cf9f64b4d2b65b68942e93861409ea90f (diff) | |
| download | samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.gz samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.bz2 samba-51db4c3f3d81d1ed03beae6426786c843ac59807.zip | |
r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack.
(This used to be commit ba75f1613a9aac69dd5df94dd8a2b37820acd166)
Diffstat (limited to 'source4/lib/dbwrap')
| -rw-r--r-- | source4/lib/dbwrap/dbwrap.c | 10 | ||||
| -rw-r--r-- | source4/lib/dbwrap/dbwrap.h | 5 | ||||
| -rw-r--r-- | source4/lib/dbwrap/dbwrap_tdb.c | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/source4/lib/dbwrap/dbwrap.c b/source4/lib/dbwrap/dbwrap.c index 9e893b1243..791d0adee6 100644 --- a/source4/lib/dbwrap/dbwrap.c +++ b/source4/lib/dbwrap/dbwrap.c @@ -25,15 +25,15 @@ #include "lib/dbwrap/dbwrap.h" #include "param/param.h" -/* +/** open a temporary database */ -struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags) +struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags) { - if (lp_parm_bool(global_loadparm, NULL, "ctdb", "enable", false) && - lp_parm_bool(global_loadparm, NULL, "ctdb", name, true)) { + if (lp_parm_bool(lp_ctx, NULL, "ctdb", "enable", false) && + lp_parm_bool(lp_ctx, NULL, "ctdb", name, true)) { return db_tmp_open_ctdb(mem_ctx, name, tdb_flags); } - return db_tmp_open_tdb(mem_ctx, name, tdb_flags); + return db_tmp_open_tdb(mem_ctx, lp_ctx, name, tdb_flags); } diff --git a/source4/lib/dbwrap/dbwrap.h b/source4/lib/dbwrap/dbwrap.h index b4267d802d..fc1f123e23 100644 --- a/source4/lib/dbwrap/dbwrap.h +++ b/source4/lib/dbwrap/dbwrap.h @@ -45,9 +45,10 @@ struct db_context { void *private_data; }; -struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags); +struct loadparm_context; +struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags); /* backends */ -struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags); +struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags); struct db_context *db_tmp_open_ctdb(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags); diff --git a/source4/lib/dbwrap/dbwrap_tdb.c b/source4/lib/dbwrap/dbwrap_tdb.c index 621b19532d..fae73a1db8 100644 --- a/source4/lib/dbwrap/dbwrap_tdb.c +++ b/source4/lib/dbwrap/dbwrap_tdb.c @@ -225,7 +225,8 @@ static int db_tdb_get_seqnum(struct db_context *db) /* open a temporary database */ -struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags) +struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, + const char *name, int tdb_flags) { struct db_context *result; struct db_tdb_ctx *db_tdb; @@ -241,7 +242,7 @@ struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, const char *name, int td /* the name passed in should not be a full path, it should be just be the db name */ - path = smbd_tmp_path(result, global_loadparm, name); + path = smbd_tmp_path(result, lp_ctx, name); db_tdb->wtdb = tdb_wrap_open(db_tdb, path, 0, tdb_flags, O_CREAT|O_RDWR, 0666); |