smbd: pass down lp_ctx to stream_new_connection_merge()

metze
(This used to be commit 91e9062265a68e3a1fe5e092503ec44ae5ea034e)

diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 9f744efa812e4b7e6fab84e308fff11eccbce25d..e27d87ec750c709852365e5b1480ac2d9d1ac89b 100644 (file)
--- 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 34d94d73a6b9e5323e489a6cc4d55c344326d280..25227481b8820aa07ddf0ae459f168bcc35c6c60 100644 (file)
--- 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);