diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-17 00:01:05 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-05-17 02:15:18 +0200 |
| commit | 250478d0445cf56e8b0b4e876977a9ae968ff55b (patch) | |
| tree | 6aa368efa33d31ec45c0865a77c08fe1238bbae1 /source4 | |
| parent | 626b2da5a9109cfa50b8bf471d5b0c59351cfc17 (diff) | |
| download | samba-250478d0445cf56e8b0b4e876977a9ae968ff55b.tar.gz samba-250478d0445cf56e8b0b4e876977a9ae968ff55b.tar.bz2 samba-250478d0445cf56e8b0b4e876977a9ae968ff55b.zip | |
smbd: pass down lp_ctx to stream_new_connection_merge()
metze
(This used to be commit 91e9062265a68e3a1fe5e092503ec44ae5ea034e)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/smbd/service_stream.c | 2 | ||||
| -rw-r--r-- | source4/wrepl_server/wrepl_in_connection.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 9f744efa81..e27d87ec75 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -119,6 +119,7 @@ void stream_io_handler_callback(void *private, uint16_t flags) a server connection */ NTSTATUS stream_new_connection_merge(struct event_context *ev, + struct loadparm_context *lp_ctx, const struct model_ops *model_ops, struct socket_context *sock, 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->msg_ctx = msg_ctx; 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), EVENT_FD_READ, stream_io_handler_fde, srv_conn); diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c index 34d94d73a6..25227481b8 100644 --- a/source4/wrepl_server/wrepl_in_connection.c +++ b/source4/wrepl_server/wrepl_in_connection.c @@ -230,7 +230,7 @@ NTSTATUS wreplsrv_in_connection_merge(struct wreplsrv_partner *partner, wrepl_in->service = service; 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, wrepl_in, &conn); NT_STATUS_NOT_OK_RETURN(status); |