param: Finish conversion from lp_wins_support() -> lp_we_are_a_wins_server()

[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 c8316a5f4c4c17a0a30d530d9bec021ee6a06f03..064e11472cbef01f097e00fa6505daa571f1875d 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -27,8 +27,8 @@
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "auth/auth.h"
 #include "ldb_wrap.h"
 #include "param/param.h"
@@ -38,9 +38,9 @@ static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx,
                                                  struct tevent_context *ev_ctx,
                                                  struct loadparm_context *lp_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);
+       return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, lpcfg_private_path(mem_ctx,
+                               lp_ctx, lpcfg_wins_config_url(lp_ctx)),
+                               system_session(lp_ctx), NULL, 0);
 }
 
 static uint64_t wins_config_db_get_seqnumber(struct ldb_context *ldb)
@@ -74,12 +74,12 @@ failed:
 static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service, 
                                     struct loadparm_context *lp_ctx)
 {
-       const char *owner = lp_parm_string(lp_ctx, NULL, "winsdb", "local_owner");
+       const char *owner = lpcfg_parm_string(lp_ctx, NULL, "winsdb", "local_owner");
 
        if (owner == NULL) {
                struct interface *ifaces;
-               load_interfaces(service, lp_interfaces(lp_ctx), &ifaces);
-               owner = iface_n_ip(ifaces, 0);
+               load_interface_list(service, lp_ctx, &ifaces);
+               owner = iface_list_first_v4(ifaces);
        }
 
        service->wins_db     = winsdb_connect(service, service->task->event_ctx, lp_ctx, owner, WINSDB_HANDLE_CALLER_WREPL);
@@ -93,26 +93,26 @@ static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service,
        }
 
        /* the default renew interval is 6 days */
-       service->config.renew_interval    = lp_parm_int(lp_ctx, NULL,"wreplsrv","renew_interval", 6*24*60*60);
+       service->config.renew_interval    = lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","renew_interval", 6*24*60*60);
 
        /* the default tombstone (extinction) interval is 6 days */
-       service->config.tombstone_interval= lp_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_interval", 6*24*60*60);
+       service->config.tombstone_interval= lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_interval", 6*24*60*60);
 
        /* the default tombstone (extinction) timeout is 1 day */
-       service->config.tombstone_timeout = lp_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_timeout", 1*24*60*60);
+       service->config.tombstone_timeout = lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_timeout", 1*24*60*60);
 
        /* the default tombstone extra timeout is 3 days */
-       service->config.tombstone_extra_timeout = lp_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_extra_timeout", 3*24*60*60);
+       service->config.tombstone_extra_timeout = lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_extra_timeout", 3*24*60*60);
 
        /* the default verify interval is 24 days */
-       service->config.verify_interval   = lp_parm_int(lp_ctx, NULL,"wreplsrv","verify_interval", 24*24*60*60);
+       service->config.verify_interval   = lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","verify_interval", 24*24*60*60);
 
        /* the default scavenging interval is 'renew_interval/2' */
-       service->config.scavenging_interval=lp_parm_int(lp_ctx, NULL,"wreplsrv","scavenging_interval",
+       service->config.scavenging_interval=lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","scavenging_interval",
                                                        service->config.renew_interval/2);
 
        /* the maximun interval to the next periodic processing event */
-       service->config.periodic_interval = lp_parm_int(lp_ctx, NULL,"wreplsrv","periodic_interval", 15);
+       service->config.periodic_interval = lpcfg_parm_int(lp_ctx, NULL,"wreplsrv","periodic_interval", 15);
 
        return NT_STATUS_OK;
 }
@@ -139,7 +139,7 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service)
        struct ldb_result *res = NULL;
        int ret;
        TALLOC_CTX *tmp_ctx;
-       int i;
+       unsigned int i;
        uint64_t new_seqnumber;
 
        new_seqnumber = wins_config_db_get_seqnumber(service->config.ldb);
@@ -363,7 +363,7 @@ static NTSTATUS wreplsrv_load_table(struct wreplsrv_service *service)
        NTSTATUS status;
        TALLOC_CTX *tmp_ctx = talloc_new(service);
        struct ldb_context *ldb = service->wins_db->ldb;
-       int i;
+       unsigned int i;
        struct wreplsrv_owner *local_owner;
        const char *wins_owner;
        uint64_t version;
@@ -451,7 +451,7 @@ static void wreplsrv_task_init(struct task_server *task)
        NTSTATUS status;
        struct wreplsrv_service *service;
 
-       if (!lp_wins_support(task->lp_ctx)) {
+       if (!lpcfg_we_are_a_wins_server(task->lp_ctx)) {
                return;
        }
 
@@ -459,7 +459,7 @@ static void wreplsrv_task_init(struct task_server *task)
 
        service = talloc_zero(task, struct wreplsrv_service);
        if (!service) {
-               task_server_terminate(task, "wreplsrv_task_init: out of memory");
+               task_server_terminate(task, "wreplsrv_task_init: out of memory", true);
                return;
        }
        service->task           = task;
@@ -471,7 +471,7 @@ static void wreplsrv_task_init(struct task_server *task)
         */
        status = wreplsrv_open_winsdb(service, task->lp_ctx);
        if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_open_winsdb() failed");
+               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_open_winsdb() failed", true);
                return;
        }
 
@@ -480,23 +480,23 @@ static void wreplsrv_task_init(struct task_server *task)
         */
        status = wreplsrv_setup_partners(service);
        if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_partners() failed");
+               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_partners() failed", true);
                return;
        }
 
        /* 
-        * setup listen sockets, so we can anwser requests from our partners,
+        * setup listen sockets, so we can answer requests from our partners,
         * which pull from us
         */
        status = wreplsrv_setup_sockets(service, task->lp_ctx);
        if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_sockets() failed");
+               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_sockets() failed", true);
                return;
        }
 
        status = wreplsrv_setup_periodic(service);
        if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_periodic() failed");
+               task_server_terminate(task, "wreplsrv_task_init: wreplsrv_setup_periodic() failed", true);
                return;
        }