Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

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

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 7d4be3e1b5171657b06e49cbb5f967842cd66ff2..b7030669869af7561d64bed1db8e6b73601b3b8d 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -35,9 +35,10 @@
 #include "lib/socket/netif.h"
 
 static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx, 
+                                                 struct event_context *ev_ctx,
                                                  struct loadparm_context *lp_ctx)
 {
-       return ldb_wrap_connect(mem_ctx, lp_ctx, private_path(mem_ctx, 
+       return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, private_path(mem_ctx, 
                                lp_ctx, lp_wins_config_url(lp_ctx)),
                                system_session(mem_ctx, lp_ctx), NULL, 0, NULL);
 }
@@ -83,12 +84,12 @@ static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service,
                owner = iface_n_ip(ifaces, 0);
        }
 
-       service->wins_db     = winsdb_connect(service, lp_ctx, owner, WINSDB_HANDLE_CALLER_WREPL);
+       service->wins_db     = winsdb_connect(service, service->task->event_ctx, lp_ctx, owner, WINSDB_HANDLE_CALLER_WREPL);
        if (!service->wins_db) {
                return NT_STATUS_INTERNAL_DB_ERROR;
        }
 
-       service->config.ldb = wins_config_db_connect(service, lp_ctx);
+       service->config.ldb = wins_config_db_connect(service, service->task->event_ctx, lp_ctx);
        if (!service->config.ldb) {
                return NT_STATUS_INTERNAL_DB_ERROR;
        }
@@ -453,6 +454,10 @@ static void wreplsrv_task_init(struct task_server *task)
        NTSTATUS status;
        struct wreplsrv_service *service;
 
+       if (!lp_wins_support(task->lp_ctx)) {
+               return;
+       }
+
        task_server_set_title(task, "task[wreplsrv]");
 
        service = talloc_zero(task, struct wreplsrv_service);
@@ -501,22 +506,10 @@ static void wreplsrv_task_init(struct task_server *task)
        irpc_add_name(task->msg_ctx, "wrepl_server");
 }
 
-/*
-  initialise the WREPL server
- */
-static NTSTATUS wreplsrv_init(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const struct model_ops *model_ops)
-{
-       if (!lp_wins_support(lp_ctx)) {
-               return NT_STATUS_OK;
-       }
-
-       return task_server_startup(event_ctx, model_ops, wreplsrv_task_init);
-}
-
 /*
   register ourselves as a available server
 */
 NTSTATUS server_service_wrepl_init(void)
 {
-       return register_server_service("wrepl", wreplsrv_init);
+       return register_server_service("wrepl", wreplsrv_task_init);
 }