diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 19:27:49 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:07 +0100 |
| commit | b5594df87d054d203e9bfb52a49c87bc3ecf46a1 (patch) | |
| tree | acc4bcd503c342ebc87970905796951e3fe042d3 /source4/wrepl_server | |
| parent | cc04f143dcd35fb67884e385ffd3e6ed2d32a4c2 (diff) | |
| download | samba-b5594df87d054d203e9bfb52a49c87bc3ecf46a1.tar.gz samba-b5594df87d054d203e9bfb52a49c87bc3ecf46a1.tar.bz2 samba-b5594df87d054d203e9bfb52a49c87bc3ecf46a1.zip | |
r26230: Use task-provided loadparm context in a couple more places, avoid loadparm context inside ntlm_auth.
(This used to be commit 3a946d1ffd7739e40beab673ecb0100c178c2e28)
Diffstat (limited to 'source4/wrepl_server')
| -rw-r--r-- | source4/wrepl_server/wrepl_in_connection.c | 6 | ||||
| -rw-r--r-- | source4/wrepl_server/wrepl_server.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c index d26c89d35d..65c8b6118f 100644 --- a/source4/wrepl_server/wrepl_in_connection.c +++ b/source4/wrepl_server/wrepl_in_connection.c @@ -258,7 +258,7 @@ NTSTATUS wreplsrv_in_connection_merge(struct wreplsrv_partner *partner, /* startup the wrepl port 42 server sockets */ -NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service) +NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadparm_context *lp_ctx) { NTSTATUS status; struct task_server *task = service->task; @@ -275,7 +275,7 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service) return NT_STATUS_INTERNAL_ERROR; } - if (lp_interfaces(global_loadparm) && lp_bind_interfaces_only(global_loadparm)) { + if (lp_interfaces(lp_ctx) && lp_bind_interfaces_only(lp_ctx)) { int num_interfaces = iface_count(); int i; @@ -294,7 +294,7 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service) } } } else { - address = lp_socket_address(global_loadparm); + address = lp_socket_address(lp_ctx); status = stream_setup_socket(task->event_ctx, model_ops, &wreplsrv_stream_ops, "ipv4", address, &port, service); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index 91f0a4fb05..a5c8007285 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -477,7 +477,7 @@ static void wreplsrv_task_init(struct task_server *task) * setup listen sockets, so we can anwser requests from our partners, * which pull from us */ - status = wreplsrv_setup_sockets(service); + status = wreplsrv_setup_sockets(service, task->lp_ctx); if (!NT_STATUS_IS_OK(status)) { task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_sockets() failed"); return; |