sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-23 01:44:20 +03:00
Code Activity

smbd: pass down lp_ctx to stream_new_connection_merge()

Browse Source 
metze
(This used to be commit 91e9062265)
This commit is contained in:
Stefan Metzmacher
2008-05-17 00:01:05 +02:00
parent 626b2da5a9
commit 250478d044
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source4/smbd/service_stream.c
View File

@@ -119,6 +119,7 @@ void stream_io_handler_callback(void *private, uint16_t flags)
a server connection a server connection
*/ */
NTSTATUS stream_new_connection_merge(struct event_context *ev, NTSTATUS stream_new_connection_merge(struct event_context *ev,
struct loadparm_context *lp_ctx,
const struct model_ops *model_ops, const struct model_ops *model_ops,
struct socket_context *sock, struct socket_context *sock,
const struct stream_server_ops *stream_ops, const struct stream_server_ops *stream_ops,
@@ -140,6 +141,7 @@ NTSTATUS stream_new_connection_merge(struct event_context *ev,
srv_conn->ops = stream_ops; srv_conn->ops = stream_ops;
srv_conn->msg_ctx = msg_ctx; srv_conn->msg_ctx = msg_ctx;
srv_conn->event.ctx = ev; srv_conn->event.ctx = ev;
srv_conn->lp_ctx = lp_ctx;
srv_conn->event.fde = event_add_fd(ev, srv_conn, socket_get_fd(sock), srv_conn->event.fde = event_add_fd(ev, srv_conn, socket_get_fd(sock),
EVENT_FD_READ, EVENT_FD_READ,
stream_io_handler_fde, srv_conn); stream_io_handler_fde, srv_conn);

2
source4/wrepl_server/wrepl_in_connection.c
View File

@@ -230,7 +230,7 @@ NTSTATUS wreplsrv_in_connection_merge(struct wreplsrv_partner *partner,
wrepl_in->service = service; wrepl_in->service = service;
wrepl_in->partner = partner; wrepl_in->partner = partner;
status = stream_new_connection_merge(service->task->event_ctx, model_ops, status = stream_new_connection_merge(service->task->event_ctx, service->task->lp_ctx, model_ops,
sock, &wreplsrv_stream_ops, service->task->msg_ctx, sock, &wreplsrv_stream_ops, service->task->msg_ctx,
wrepl_in, &conn); wrepl_in, &conn);
NT_STATUS_NOT_OK_RETURN(status); NT_STATUS_NOT_OK_RETURN(status);