summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-08 23:32:43 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:57 +0100
commita72c5053c587f0ed6113ef514fe3739cb81e7abf (patch)
tree6099f21bea03a584363c76c6b87a0f648f35d44e /source4/libcli
parentdd7e5ed88c48f4ee39e53be07c8839791e914e45 (diff)
downloadsamba-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/libcli')
-rw-r--r--source4/libcli/ldap/ldap_bind.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index 99b471e9a6..ba1ae90ebd 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -43,7 +43,8 @@ NTSTATUS ldap_rebind(struct ldap_connection *conn)
switch (conn->bind.type) {
case LDAP_BIND_SASL:
- status = ldap_bind_sasl(conn, (struct cli_credentials *)conn->bind.creds);
+ status = ldap_bind_sasl(conn, (struct cli_credentials *)conn->bind.creds,
+ global_loadparm);
break;
case LDAP_BIND_SIMPLE:
@@ -200,7 +201,8 @@ static struct ldap_message *new_ldap_sasl_bind_msg(struct ldap_connection *conn,
perform a sasl bind using the given credentials
*/
NTSTATUS ldap_bind_sasl(struct ldap_connection *conn,
- struct cli_credentials *creds)
+ struct cli_credentials *creds,
+ struct loadparm_context *lp_ctx)
{
NTSTATUS status;
TALLOC_CTX *tmp_ctx = NULL;
@@ -219,7 +221,7 @@ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn,
NULL
};
- status = gensec_client_start(conn, &conn->gensec, NULL, global_loadparm);
+ status = gensec_client_start(conn, &conn->gensec, NULL, lp_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to start GENSEC engine (%s)\n", nt_errstr(status)));
goto failed;