r26355: Eliminate global_loadparm in more places.

[kai/samba.git] / source4 / libcli / ldap / ldap_bind.c

diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index d285735d4e0318c17439343807555604826491de..bd548be38e416f182cb985abd7a8a54ac678833f 100644 (file)
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -29,6 +29,7 @@
 #include "auth/gensec/socket.h"
 #include "auth/credentials/credentials.h"
 #include "lib/stream/packet.h"
+#include "param/param.h"
 
 struct ldap_simple_creds {
        const char *dn;
@@ -42,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,
+                                       conn->lp_ctx);
                break;
                
        case LDAP_BIND_SIMPLE:
@@ -198,7 +200,9 @@ 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)
+NTSTATUS ldap_bind_sasl(struct ldap_connection *conn, 
+                       struct cli_credentials *creds,
+                       struct loadparm_context *lp_ctx)
 {
        NTSTATUS status;
        TALLOC_CTX *tmp_ctx = NULL;
@@ -217,7 +221,7 @@ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn, struct cli_credentials *cr
                NULL 
        };
 
-       status = gensec_client_start(conn, &conn->gensec, NULL);
+       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;