diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:56:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:05 +0100 |
| commit | 51db4c3f3d81d1ed03beae6426786c843ac59807 (patch) | |
| tree | d85647baa9f9715657a900da164ea54dc07fd13f /source4/ldap_server | |
| parent | f4a1083cf9f64b4d2b65b68942e93861409ea90f (diff) | |
| download | samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.gz samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.bz2 samba-51db4c3f3d81d1ed03beae6426786c843ac59807.zip | |
r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack.
(This used to be commit ba75f1613a9aac69dd5df94dd8a2b37820acd166)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_bind.c | 3 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c index fe4680b1f2..50521e9a52 100644 --- a/source4/ldap_server/ldap_bind.c +++ b/source4/ldap_server/ldap_bind.c @@ -27,6 +27,7 @@ #include "dsdb/samdb/samdb.h" #include "auth/gensec/gensec.h" #include "auth/gensec/socket.h" +#include "param/param.h" static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call) { @@ -46,7 +47,7 @@ static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call) status = crack_auto_name_to_nt4_name(call, req->dn, &nt4_domain, &nt4_account); if (NT_STATUS_IS_OK(status)) { - status = authenticate_username_pw(call, + status = authenticate_username_pw(global_loadparm, call, call->conn->connection->event.ctx, call->conn->connection->msg_ctx, nt4_domain, nt4_account, diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 1ee37dceff..30afe7c590 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -389,8 +389,7 @@ static void ldapsrv_accept(struct stream_connection *c) /* Ensure we don't get packets until the database is ready below */ packet_recv_disable(conn->packet); - server_credentials - = cli_credentials_init(conn); + server_credentials = cli_credentials_init(conn); if (!server_credentials) { stream_terminate_connection(c, "Failed to init server credentials\n"); return; @@ -515,7 +514,7 @@ static void ldapsrv_task_init(struct task_server *task) NTSTATUS status; const struct model_ops *model_ops; - switch (lp_server_role(global_loadparm)) { + switch (lp_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "ldap_server: no LDAP server required in standalone configuration"); return; |