diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
| commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/smbd/service_stream.c | |
| parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
| parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
| download | samba-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/smbd/service_stream.c')
| -rw-r--r-- | source4/smbd/service_stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 8c38f27d74..85efa34339 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -173,7 +173,7 @@ static void stream_new_connection(struct tevent_context *ev, srv_conn->event.ctx = ev; srv_conn->lp_ctx = lp_ctx; - if (!socket_check_access(sock, "smbd", lp_hostsallow(NULL, lp_default_service(lp_ctx)), lp_hostsdeny(NULL, lp_default_service(lp_ctx)))) { + if (!socket_check_access(sock, "smbd", lpcfg_hostsallow(NULL, lpcfg_default_service(lp_ctx)), lpcfg_hostsdeny(NULL, lpcfg_default_service(lp_ctx)))) { stream_terminate_connection(srv_conn, "denied by access rules"); return; } @@ -187,7 +187,7 @@ static void stream_new_connection(struct tevent_context *ev, /* setup to receive internal messages on this connection */ srv_conn->msg_ctx = messaging_init(srv_conn, - lp_messaging_path(srv_conn, lp_ctx), + lpcfg_messaging_path(srv_conn, lp_ctx), srv_conn->server_id, ev); if (!srv_conn->msg_ctx) { stream_terminate_connection(srv_conn, "messaging_init() failed"); @@ -242,7 +242,7 @@ static void stream_accept_handler(struct tevent_context *ev, struct tevent_fd *f /* ask the process model to create us a process for this new connection. When done, it calls stream_new_connection() with the newly created socket */ - stream_socket->model_ops->accept_connection(ev, stream_socket->lp_ctx, + stream_socket->model_ops->accept_connection(ev, stream_socket->lp_ctx, stream_socket->sock, stream_new_connection, stream_socket); } |