diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-07-16 14:32:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-07-16 18:24:27 +1000 |
| commit | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/web_server | |
| parent | e4c35c5a09dd66c9280caa39130b7e3b941b7e51 (diff) | |
| download | samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.gz samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.bz2 samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.zip | |
s4-loadparm: 2nd half of lp_ to lpcfg_ conversion
this converts all callers that use the Samba4 loadparm lp_ calling
convention to use the lpcfg_ prefix.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/web_server')
| -rw-r--r-- | source4/web_server/web_server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index af11def5a5..f40f0a625b 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -300,7 +300,7 @@ static const struct stream_server_ops web_stream_ops = { static void websrv_task_init(struct task_server *task) { NTSTATUS status; - uint16_t port = lp_web_port(task->lp_ctx); + uint16_t port = lpcfg_web_port(task->lp_ctx); const struct model_ops *model_ops; struct web_server_data *wdata; @@ -310,21 +310,21 @@ static void websrv_task_init(struct task_server *task) model_ops = process_model_startup(task->event_ctx, "single"); if (!model_ops) goto failed; - if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) { + if (lpcfg_interfaces(task->lp_ctx) && lpcfg_bind_interfaces_only(task->lp_ctx)) { int num_interfaces; int i; struct interface *ifaces; - load_interfaces(NULL, lp_interfaces(task->lp_ctx), &ifaces); + load_interfaces(NULL, lpcfg_interfaces(task->lp_ctx), &ifaces); num_interfaces = iface_count(ifaces); for(i = 0; i < num_interfaces; i++) { const char *address = iface_n_ip(ifaces, i); status = stream_setup_socket(task->event_ctx, - task->lp_ctx, model_ops, + task->lp_ctx, model_ops, &web_stream_ops, "ipv4", address, - &port, lp_socket_options(task->lp_ctx), + &port, lpcfg_socket_options(task->lp_ctx), task); if (!NT_STATUS_IS_OK(status)) goto failed; } @@ -333,8 +333,8 @@ static void websrv_task_init(struct task_server *task) } else { status = stream_setup_socket(task->event_ctx, task->lp_ctx, model_ops, &web_stream_ops, - "ipv4", lp_socket_address(task->lp_ctx), - &port, lp_socket_options(task->lp_ctx), task); + "ipv4", lpcfg_socket_address(task->lp_ctx), + &port, lpcfg_socket_options(task->lp_ctx), task); if (!NT_STATUS_IS_OK(status)) goto failed; } |