mirror of
https://github.com/samba-team/samba.git
synced 2025-10-21 03:33:16 +03:00
r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack.
This commit is contained in:
committed by
Stefan Metzmacher
parent
0721a07aad
commit
ba75f1613a
@@ -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,
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user