wreplsrv: log a successful replication cycle at level 1

[kai/samba.git] / source4 / wrepl_server / wrepl_in_connection.c

diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index f2cf7c6113a8ad62b227b0d7aa8b6c15eedf8c99..ecc265e590abcb4e922ab24565a4a66a2b62db6f 100644 (file)
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -66,7 +66,7 @@ static NTSTATUS wreplsrv_recv_request(void *private, DATA_BLOB blob)
        packet_in_blob.length = blob.length - 4;
 
        ndr_err = ndr_pull_struct_blob(&packet_in_blob, call, 
-                                      lp_iconv_convenience(global_loadparm),
+                                      lp_iconv_convenience(wreplconn->service->task->lp_ctx),
                                       &call->req_packet,
                                       (ndr_pull_flags_fn_t)ndr_pull_wrepl_packet);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -91,7 +91,7 @@ static NTSTATUS wreplsrv_recv_request(void *private, DATA_BLOB blob)
        /* and now encode the reply */
        packet_out_wrap.packet = call->rep_packet;
        ndr_err = ndr_push_struct_blob(&packet_out_blob, call, 
-                                      lp_iconv_convenience(global_loadparm),
+                                      lp_iconv_convenience(wreplconn->service->task->lp_ctx),
                                       &packet_out_wrap,
                                      (ndr_push_flags_fn_t)ndr_push_wrepl_wrap);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -218,7 +218,7 @@ NTSTATUS wreplsrv_in_connection_merge(struct wreplsrv_partner *partner,
        /* within the wrepl task we want to be a single process, so
           ask for the single process model ops and pass these to the
           stream_setup_socket() call. */
-       model_ops = process_model_byname("single");
+       model_ops = process_model_startup(service->task->event_ctx, "single");
        if (!model_ops) {
                DEBUG(0,("Can't find 'single' process model_ops"));
                return NT_STATUS_INTERNAL_ERROR;
@@ -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);
@@ -273,7 +273,7 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar
        /* within the wrepl task we want to be a single process, so
           ask for the single process model ops and pass these to the
           stream_setup_socket() call. */
-       model_ops = process_model_byname("single");
+       model_ops = process_model_startup(task->event_ctx, "single");
        if (!model_ops) {
                DEBUG(0,("Can't find 'single' process model_ops"));
                return NT_STATUS_INTERNAL_ERROR;
@@ -294,7 +294,9 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar
                */
                for(i = 0; i < num_interfaces; i++) {
                        address = iface_n_ip(ifaces, i);
-                       status = stream_setup_socket(task->event_ctx, model_ops, &wreplsrv_stream_ops,
+                       status = stream_setup_socket(task->event_ctx, 
+                                                    task->lp_ctx, model_ops, 
+                                                    &wreplsrv_stream_ops,
                                                     "ipv4", address, &port, 
                                                      lp_socket_options(task->lp_ctx), 
                                                     service);
@@ -306,7 +308,8 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar
                }
        } else {
                address = lp_socket_address(lp_ctx);
-               status = stream_setup_socket(task->event_ctx, model_ops, &wreplsrv_stream_ops,
+               status = stream_setup_socket(task->event_ctx, task->lp_ctx, 
+                                            model_ops, &wreplsrv_stream_ops,
                                             "ipv4", address, &port, lp_socket_options(task->lp_ctx), 
                                             service);
                if (!NT_STATUS_IS_OK(status)) {