diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-05 15:36:33 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-05 09:42:02 -0600 |
| commit | 2c8c9a535500e40084c4810da1890df8d9415659 (patch) | |
| tree | 4ddfde12662feb02646d1ab8bc6c8e57bcea19aa /source4/ldap_server | |
| parent | a5301d220439e096c996629146128423ee47a868 (diff) | |
| download | samba-2c8c9a535500e40084c4810da1890df8d9415659.tar.gz samba-2c8c9a535500e40084c4810da1890df8d9415659.tar.bz2 samba-2c8c9a535500e40084c4810da1890df8d9415659.zip | |
r26669: Janitorial: Remove uses of global_loadparm.
(This used to be commit 50c46160d997e0448f51ae09e0f3c79e8519fa41)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 4 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 9bb1279a99..c7b1099166 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -345,7 +345,7 @@ static void ldapsrv_accept(struct stream_connection *c) conn->connection = c; conn->service = ldapsrv_service; conn->sockets.raw = c->socket; - conn->lp_ctx = global_loadparm; + conn->lp_ctx = ldapsrv_service->task->lp_ctx; c->private = conn; @@ -523,6 +523,8 @@ static void ldapsrv_task_init(struct task_server *task) ldap_service = talloc_zero(task, struct ldapsrv_service); if (ldap_service == NULL) goto failed; + ldap_service->task = task; + ldap_service->tls_params = tls_initialise(ldap_service, task->lp_ctx); if (ldap_service->tls_params == NULL) goto failed; diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h index 88af0fb5fc..4f7a5b9be9 100644 --- a/source4/ldap_server/ldap_server.h +++ b/source4/ldap_server/ldap_server.h @@ -65,6 +65,7 @@ struct ldapsrv_call { struct ldapsrv_service { struct tls_params *tls_params; + struct task_server *task; }; #include "ldap_server/proto.h" |