From df408d056ec03f2abe08ce0ea487e1875b90e7bf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 5 Jan 2008 19:03:43 -0600 Subject: r26672: Janitorial: Remove uses of global_loadparm. (This used to be commit 18cd08623eaad7d2cd63b82ea5275d4dfd21cf00) --- source4/ldap_server/ldap_server.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source4/ldap_server') diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index c7b1099166..fcc9435ead 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -449,7 +449,8 @@ static NTSTATUS add_socket(struct event_context *event_context, NTSTATUS status; struct ldb_context *ldb; - status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, + status = stream_setup_socket(event_context, lp_ctx, + model_ops, &ldap_stream_ops, "ipv4", address, &port, lp_socket_options(lp_ctx), ldap_service); @@ -461,7 +462,8 @@ static NTSTATUS add_socket(struct event_context *event_context, if (tls_support(ldap_service->tls_params)) { /* add ldaps server */ port = 636; - status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, + status = stream_setup_socket(event_context, lp_ctx, + model_ops, &ldap_stream_ops, "ipv4", address, &port, lp_socket_options(lp_ctx), ldap_service); @@ -479,7 +481,8 @@ static NTSTATUS add_socket(struct event_context *event_context, if (samdb_is_gc(ldb)) { port = 3268; - status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, + status = stream_setup_socket(event_context, lp_ctx, + model_ops, &ldap_stream_ops, "ipv4", address, &port, lp_socket_options(lp_ctx), ldap_service); @@ -556,7 +559,8 @@ static void ldapsrv_task_init(struct task_server *task) goto failed; } - status = stream_setup_socket(task->event_ctx, model_ops, &ldap_stream_ops, + status = stream_setup_socket(task->event_ctx, task->lp_ctx, + model_ops, &ldap_stream_ops, "unix", ldapi_path, NULL, lp_socket_options(task->lp_ctx), ldap_service); @@ -580,7 +584,8 @@ static NTSTATUS ldapsrv_init(struct event_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { - return task_server_startup(event_context, model_ops, ldapsrv_task_init); + return task_server_startup(event_context, lp_ctx, model_ops, + ldapsrv_task_init); } -- cgit