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/lib | |
| 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/lib')
| -rw-r--r-- | source4/lib/charset/iconv.c | 2 | ||||
| -rw-r--r-- | source4/lib/db_wrap.c | 2 | ||||
| -rw-r--r-- | source4/lib/dbwrap/dbwrap.c | 4 | ||||
| -rw-r--r-- | source4/lib/events/events.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ad2oLschema.c | 2 | ||||
| -rw-r--r-- | source4/lib/socket/socket.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index 1c571f8961..9b035cd1db 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -199,7 +199,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) } #ifdef HAVE_NATIVE_ICONV - if ((!from || !to) && !lp_parm_bool(NULL, "iconv", "native", true)) { + if ((!from || !to) && !lp_parm_bool(global_loadparm, NULL, "iconv", "native", true)) { goto failed; } if (!from) { diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index 82521f2e7e..4c0a06cf2c 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -164,7 +164,7 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx, } /* allow admins to force non-sync ldb for all databases */ - if (lp_parm_bool(NULL, "ldb", "nosync", false)) { + if (lp_parm_bool(global_loadparm, NULL, "ldb", "nosync", false)) { flags |= LDB_FLG_NOSYNC; } diff --git a/source4/lib/dbwrap/dbwrap.c b/source4/lib/dbwrap/dbwrap.c index 057a6f0057..9e893b1243 100644 --- a/source4/lib/dbwrap/dbwrap.c +++ b/source4/lib/dbwrap/dbwrap.c @@ -30,8 +30,8 @@ */ struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags) { - if (lp_parm_bool(NULL, "ctdb", "enable", false) && - lp_parm_bool(NULL, "ctdb", name, true)) { + if (lp_parm_bool(global_loadparm, NULL, "ctdb", "enable", false) && + lp_parm_bool(global_loadparm, NULL, "ctdb", name, true)) { return db_tmp_open_ctdb(mem_ctx, name, tdb_flags); } diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c index da3cc3bfe0..c1e57a3d32 100644 --- a/source4/lib/events/events.c +++ b/source4/lib/events/events.c @@ -185,7 +185,7 @@ struct event_context *event_context_init_byname(TALLOC_CTX *mem_ctx, const char #if _SAMBA_BUILD_ if (name == NULL) { - name = lp_parm_string(NULL, "event", "backend"); + name = lp_parm_string(global_loadparm, NULL, "event", "backend"); } #endif if (name == NULL) { diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c index 64df4cfecb..3c612f8a81 100644 --- a/source4/lib/ldb/tools/ad2oLschema.c +++ b/source4/lib/ldb/tools/ad2oLschema.c @@ -677,7 +677,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_ } } - target_str = lp_parm_string(NULL, "convert", "target"); + target_str = lp_parm_string(global_loadparm, NULL, "convert", "target"); if (!target_str || strcasecmp(target_str, "openldap") == 0) { target = TARGET_OPENLDAP; diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c index 55a1b6394b..6da35f3af8 100644 --- a/source4/lib/socket/socket.c +++ b/source4/lib/socket/socket.c @@ -70,7 +70,7 @@ _PUBLIC_ NTSTATUS socket_create_with_ops(TALLOC_CTX *mem_ctx, const struct socke if (!(flags & SOCKET_FLAG_BLOCK) && type == SOCKET_TYPE_STREAM && - lp_parm_bool(NULL, "socket", "testnonblock", false)) { + lp_parm_bool(global_loadparm, NULL, "socket", "testnonblock", false)) { (*new_sock)->flags |= SOCKET_FLAG_TESTNONBLOCK; } |