summaryrefslogtreecommitdiff
path: root/source4/web_server/web_server.c
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2010-07-16 09:57:03 -0400
committerSimo Sorce <idra@samba.org>2010-07-16 09:57:03 -0400
commit378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch)
tree9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/web_server/web_server.c
parent2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff)
parent6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff)
downloadsamba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz
samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2
samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/web_server/web_server.c')
-rw-r--r--source4/web_server/web_server.c14
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;
}