diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-08 23:32:43 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:57 +0100 |
| commit | a72c5053c587f0ed6113ef514fe3739cb81e7abf (patch) | |
| tree | 6099f21bea03a584363c76c6b87a0f648f35d44e /source4/lib | |
| parent | dd7e5ed88c48f4ee39e53be07c8839791e914e45 (diff) | |
| download | samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.tar.gz samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.tar.bz2 samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.zip | |
r26353: Remove use of global_loadparm.
(This used to be commit 17637e4490e42db6cdef619286c4d5a0982e9d1a)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/dbwrap/dbwrap.c | 2 | ||||
| -rw-r--r-- | source4/lib/dbwrap/dbwrap.h | 2 | ||||
| -rw-r--r-- | source4/lib/dbwrap/dbwrap_ctdb.c | 3 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_ildap/ldb_ildap.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/dbwrap/dbwrap.c b/source4/lib/dbwrap/dbwrap.c index 791d0adee6..be48e97b5a 100644 --- a/source4/lib/dbwrap/dbwrap.c +++ b/source4/lib/dbwrap/dbwrap.c @@ -32,7 +32,7 @@ struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ { 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_ctdb(mem_ctx, lp_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 fc1f123e23..1a3b3f5273 100644 --- a/source4/lib/dbwrap/dbwrap.h +++ b/source4/lib/dbwrap/dbwrap.h @@ -51,4 +51,4 @@ struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ /* backends */ 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); +struct db_context *db_tmp_open_ctdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags); diff --git a/source4/lib/dbwrap/dbwrap_ctdb.c b/source4/lib/dbwrap/dbwrap_ctdb.c index f635af04c8..f3daa7dfe5 100644 --- a/source4/lib/dbwrap/dbwrap_ctdb.c +++ b/source4/lib/dbwrap/dbwrap_ctdb.c @@ -159,7 +159,8 @@ static int db_ctdb_get_seqnum(struct db_context *db) return -1; } -struct db_context *db_tmp_open_ctdb(TALLOC_CTX *mem_ctx, const char *name, int tdb_flags) +struct db_context *db_tmp_open_ctdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, + const char *name, int tdb_flags) { struct db_context *db; struct ctdb_context *ctdb = talloc_get_type(cluster_backend_handle(), diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 7b9023958c..0c0ee629bf 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -49,6 +49,7 @@ #include "libcli/ldap/ldap_client.h" #include "auth/auth.h" #include "auth/credentials/credentials.h" +#include "param/param.h" struct ildb_private { struct ldap_connection *ldap; @@ -792,7 +793,7 @@ static int ildb_connect(struct ldb_context *ldb, const char *url, goto failed; } } else { - status = ldap_bind_sasl(ildb->ldap, creds); + status = ldap_bind_sasl(ildb->ldap, creds, global_loadparm); if (!NT_STATUS_IS_OK(status)) { ldb_debug(ldb, LDB_DEBUG_ERROR, "Failed to bind - %s\n", ldap_errstr(ildb->ldap, module, status)); |