summaryrefslogtreecommitdiff
path: root/source4/libcli/ldap/ldap_bind.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-22 10:21:22 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-22 10:21:22 +0200
commit38a4f9df170fba0a05755e06dd4362d471b3db80 (patch)
treea1f3623e06ce4fd1e010afd5e72062dbee0d9b83 /source4/libcli/ldap/ldap_bind.c
parent54efc107e58ed1eed7109ea08fdf808e3a15327b (diff)
parent7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c (diff)
downloadsamba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.gz
samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.bz2
samba-38a4f9df170fba0a05755e06dd4362d471b3db80.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)
Diffstat (limited to 'source4/libcli/ldap/ldap_bind.c')
-rw-r--r--source4/libcli/ldap/ldap_bind.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index 2c04edf950..e1569e7296 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -200,7 +200,7 @@ static struct ldap_message *new_ldap_sasl_bind_msg(struct ldap_connection *conn,
/*
perform a sasl bind using the given credentials
*/
-_PUBLIC_ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn,
+_PUBLIC_ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn,
struct cli_credentials *creds,
struct loadparm_context *lp_ctx)
{
@@ -223,7 +223,8 @@ _PUBLIC_ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn,
gensec_init(lp_ctx);
- status = gensec_client_start(conn, &conn->gensec, NULL, lp_ctx);
+ status = gensec_client_start(conn, &conn->gensec,
+ conn->event.event_ctx, lp_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to start GENSEC engine (%s)\n", nt_errstr(status)));
goto failed;