diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-29 18:00:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:31 -0500 |
| commit | 60a1046c5c5783799bd64fe18e03534670f83d82 (patch) | |
| tree | 48f788a6a6fbed5af0a3f3eea1e4373d70b03e5b /source4/cluster | |
| parent | 98038f71a7b072912c974d131012335ca22c5259 (diff) | |
| download | samba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.gz samba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.bz2 samba-60a1046c5c5783799bd64fe18e03534670f83d82.zip | |
r25430: Add the loadparm context to all parametric options.
(This used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58)
Diffstat (limited to 'source4/cluster')
| -rw-r--r-- | source4/cluster/ctdb/ctdb_cluster.c | 4 | ||||
| -rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index 8cb1c0c459..d8860aabd0 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -82,7 +82,7 @@ static struct tdb_wrap *ctdb_tdb_tmp_open(struct cluster_ops *ops, TALLOC_CTX *mem_ctx, const char *dbname, int flags) { - const char *dir = lp_parm_string(NULL, "ctdb", "shared data"); + const char *dir = lp_parm_string(global_loadparm, NULL, "ctdb", "shared data"); char *path; struct tdb_wrap *w; if (dir == NULL) { @@ -202,7 +202,7 @@ void cluster_ctdb_init(struct event_context *ev, const char *model) struct cluster_state *state; int ret; - if (!lp_parm_bool(NULL, "ctdb", "enable", false)) { + if (!lp_parm_bool(global_loadparm, NULL, "ctdb", "enable", false)) { return; } diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index a01478f784..ae174ea01d 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -97,7 +97,7 @@ static struct odb_context *odb_ctdb_init(TALLOC_CTX *mem_ctx, odb->ntvfs_ctx = ntvfs_ctx; /* leave oplocks disabled by default until the code is working */ - odb->oplocks = lp_parm_bool(NULL, "opendb", "oplocks", false); + odb->oplocks = lp_parm_bool(global_loadparm, NULL, "opendb", "oplocks", false); return odb; } |