diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:09:52 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:04 +0100 |
| commit | f4a1083cf9f64b4d2b65b68942e93861409ea90f (patch) | |
| tree | f5e03ad4edfa14eaf09d9d781825a6a30b67b5a9 /source4/cldap_server | |
| parent | 2fa338cdc99276a5f85ad54cb88b372ffe8ab063 (diff) | |
| download | samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.tar.gz samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.tar.bz2 samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.zip | |
r26227: Make loadparm_context part of a server task, move loadparm_contexts further up the call stack.
(This used to be commit 0721a07aada6a1fae6dcbd610b8783df57d7bbad)
Diffstat (limited to 'source4/cldap_server')
| -rw-r--r-- | source4/cldap_server/cldap_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index ed78f45ca7..d43669a9e1 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -159,7 +159,7 @@ static void cldapd_task_init(struct task_server *task) return; } - switch (lp_server_role(global_loadparm)) { + switch (lp_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "cldap_server: no CLDAP server required in standalone configuration"); return; @@ -180,7 +180,7 @@ static void cldapd_task_init(struct task_server *task) } cldapd->task = task; - cldapd->samctx = samdb_connect(cldapd, anonymous_session(cldapd)); + cldapd->samctx = samdb_connect(cldapd, task->lp_ctx, anonymous_session(cldapd)); if (cldapd->samctx == NULL) { task_server_terminate(task, "cldapd failed to open samdb"); return; |