r25446: Merge some changes I made on the way home from SFO:
[jelmer/samba4-debian.git] / source / wrepl_server / wrepl_server.c
index 49eb13909a012dba8c4aac1330295c8bf3bcd9d2..f4b48ae916edab1024e806df4cdb342fa8a457aa 100644 (file)
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "smbd/service_task.h"
 #include "smbd/service.h"
 #include "lib/messaging/irpc.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#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 "auth/auth.h"
 #include "db_wrap.h"
+#include "param/param.h"
 
 static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx)
 {
-       return ldb_wrap_connect(mem_ctx, private_path(mem_ctx, lp_wins_config_url()),
+       return ldb_wrap_connect(mem_ctx, global_loadparm, private_path(mem_ctx, 
+                               global_loadparm, 
+                               lp_wins_config_url(global_loadparm)),
                                system_session(mem_ctx), NULL, 0, NULL);
 }
 
@@ -47,7 +49,7 @@ static uint64_t wins_config_db_get_seqnumber(struct ldb_context *ldb)
        TALLOC_CTX *tmp_ctx = talloc_new(ldb);
        uint64_t seqnumber = 0;
 
-       dn = ldb_dn_explode(tmp_ctx, "@BASEINFO");
+       dn = ldb_dn_new(tmp_ctx, ldb, "@BASEINFO");
        if (!dn) goto failed;
 
        /* find the record in the WINS database */
@@ -58,7 +60,7 @@ static uint64_t wins_config_db_get_seqnumber(struct ldb_context *ldb)
        if (res->count > 1) goto failed;
 
        if (res->count == 1) {
-               seqnumber = ldb_msg_find_uint64(res->msgs[0], "sequenceNumber", 0);
+               seqnumber = ldb_msg_find_attr_as_uint64(res->msgs[0], "sequenceNumber", 0);
        }
 
 failed:
@@ -82,26 +84,26 @@ static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service)
        }
 
        /* the default renew interval is 6 days */
-       service->config.renew_interval    = lp_parm_int(-1,"wreplsrv","renew_interval", 6*24*60*60);
+       service->config.renew_interval    = lp_parm_int(global_loadparm, NULL,"wreplsrv","renew_interval", 6*24*60*60);
 
        /* the default tombstone (extinction) interval is 6 days */
-       service->config.tombstone_interval= lp_parm_int(-1,"wreplsrv","tombstone_interval", 6*24*60*60);
+       service->config.tombstone_interval= lp_parm_int(global_loadparm, NULL,"wreplsrv","tombstone_interval", 6*24*60*60);
 
        /* the default tombstone (extinction) timeout is 1 day */
-       service->config.tombstone_timeout = lp_parm_int(-1,"wreplsrv","tombstone_timeout", 1*24*60*60);
+       service->config.tombstone_timeout = lp_parm_int(global_loadparm, NULL,"wreplsrv","tombstone_timeout", 1*24*60*60);
 
        /* the default tombstone extra timeout is 3 days */
-       service->config.tombstone_extra_timeout = lp_parm_int(-1,"wreplsrv","tombstone_extra_timeout", 3*24*60*60);
+       service->config.tombstone_extra_timeout = lp_parm_int(global_loadparm, NULL,"wreplsrv","tombstone_extra_timeout", 3*24*60*60);
 
        /* the default verify interval is 24 days */
-       service->config.verify_interval   = lp_parm_int(-1,"wreplsrv","verify_interval", 24*24*60*60);
+       service->config.verify_interval   = lp_parm_int(global_loadparm, NULL,"wreplsrv","verify_interval", 24*24*60*60);
 
        /* the default scavenging interval is 'renew_interval/2' */
-       service->config.scavenging_interval=lp_parm_int(-1,"wreplsrv","scavenging_interval",
+       service->config.scavenging_interval=lp_parm_int(global_loadparm, 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(-1,"wreplsrv","periodic_interval", 15);
+       service->config.periodic_interval = lp_parm_int(global_loadparm, NULL,"wreplsrv","periodic_interval", 15);
 
        return NT_STATUS_OK;
 }
@@ -127,7 +129,7 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service)
        struct wreplsrv_partner *partner;
        struct ldb_result *res = NULL;
        int ret;
-       TALLOC_CTX *tmp_ctx = talloc_new(service);
+       TALLOC_CTX *tmp_ctx;
        int i;
        uint64_t new_seqnumber;
 
@@ -138,10 +140,13 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service)
                return NT_STATUS_OK;
        }
 
+       tmp_ctx = talloc_new(service);
+       NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+
        service->config.seqnumber = new_seqnumber;
 
        /* find the record in the WINS database */
-       ret = ldb_search(service->config.ldb, ldb_dn_explode(tmp_ctx, "CN=PARTNERS"), LDB_SCOPE_SUBTREE,
+       ret = ldb_search(service->config.ldb, ldb_dn_new(tmp_ctx, service->config.ldb, "CN=PARTNERS"), LDB_SCOPE_SUBTREE,
                         "(objectClass=wreplPartner)", NULL, &res);
        if (ret != LDB_SUCCESS) goto failed;
        talloc_steal(tmp_ctx, res);
@@ -154,7 +159,7 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service)
        for (i=0; i < res->count; i++) {
                const char *address;
 
-               address = ldb_msg_find_string(res->msgs[i], "address", NULL);
+               address = ldb_msg_find_attr_as_string(res->msgs[i], "address", NULL);
                if (!address) {
                        goto failed;
                }
@@ -181,26 +186,26 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service)
                        DLIST_ADD_END(service->partners, partner, struct wreplsrv_partner *);
                }
 
-               partner->name                   = ldb_msg_find_string(res->msgs[i], "name", partner->address);
+               partner->name                   = ldb_msg_find_attr_as_string(res->msgs[i], "name", partner->address);
                talloc_steal(partner, partner->name);
-               partner->our_address            = ldb_msg_find_string(res->msgs[i], "ourAddress", NULL);
+               partner->our_address            = ldb_msg_find_attr_as_string(res->msgs[i], "ourAddress", NULL);
                talloc_steal(partner, partner->our_address);
 
-               partner->type                   = ldb_msg_find_uint(res->msgs[i], "type", WINSREPL_PARTNER_BOTH);
-               partner->pull.interval          = ldb_msg_find_uint(res->msgs[i], "pullInterval",
+               partner->type                   = ldb_msg_find_attr_as_uint(res->msgs[i], "type", WINSREPL_PARTNER_BOTH);
+               partner->pull.interval          = ldb_msg_find_attr_as_uint(res->msgs[i], "pullInterval",
                                                                    WINSREPL_DEFAULT_PULL_INTERVAL);
-               partner->pull.retry_interval    = ldb_msg_find_uint(res->msgs[i], "pullRetryInterval",
+               partner->pull.retry_interval    = ldb_msg_find_attr_as_uint(res->msgs[i], "pullRetryInterval",
                                                                    WINSREPL_DEFAULT_PULL_RETRY_INTERVAL);
-               partner->push.change_count      = ldb_msg_find_uint(res->msgs[i], "pushChangeCount",
+               partner->push.change_count      = ldb_msg_find_attr_as_uint(res->msgs[i], "pushChangeCount",
                                                                    WINSREPL_DEFAULT_PUSH_CHANGE_COUNT);
-               partner->push.use_inform        = ldb_msg_find_uint(res->msgs[i], "pushUseInform", False);
+               partner->push.use_inform        = ldb_msg_find_attr_as_uint(res->msgs[i], "pushUseInform", False);
 
                DEBUG(3,("wreplsrv_load_partners: found partner: %s type: 0x%X\n",
                        partner->address, partner->type));
        }
 
        DEBUG(2,("wreplsrv_load_partners: %u partners found: wins_config_db seqnumber %llu\n",
-               res->count, service->config.seqnumber));
+               res->count, (unsigned long long)service->config.seqnumber));
 
        talloc_free(tmp_ctx);
        return NT_STATUS_OK;
@@ -320,7 +325,7 @@ NTSTATUS wreplsrv_add_table(struct wreplsrv_service *service,
 
        /* the min_version is always 0 here, and won't be updated */
 
-       /* if the given version is higher the then current nax_version, update */
+       /* if the given version is higher than the current max_version, update */
        if (cur->owner.max_version < version) {
                cur->owner.max_version = version;
                /* if it's for our local db, we need to update the wins.ldb too */
@@ -329,7 +334,8 @@ NTSTATUS wreplsrv_add_table(struct wreplsrv_service *service,
                        ret = winsdb_set_maxVersion(service->wins_db, cur->owner.max_version);
                        if (ret != cur->owner.max_version) {
                                DEBUG(0,("winsdb_set_maxVersion(%llu) failed: %llu\n",
-                                       cur->owner.max_version, ret));
+                                        (unsigned long long)cur->owner.max_version, 
+                                        (unsigned long long)ret));
                                return NT_STATUS_INTERNAL_DB_CORRUPTION;
                        }
                }
@@ -381,8 +387,8 @@ static NTSTATUS wreplsrv_load_table(struct wreplsrv_service *service)
        talloc_steal(tmp_ctx, res);
 
        for (i=0; i < res->count; i++) {
-               wins_owner     = ldb_msg_find_string(res->msgs[i], "winsOwner", NULL);
-               version        = ldb_msg_find_uint64(res->msgs[i], "versionID", 0);
+               wins_owner     = ldb_msg_find_attr_as_string(res->msgs[i], "winsOwner", NULL);
+               version        = ldb_msg_find_attr_as_uint64(res->msgs[i], "versionID", 0);
 
                status = wreplsrv_add_table(service,
                                            service, &service->table,
@@ -437,6 +443,8 @@ static void wreplsrv_task_init(struct task_server *task)
        NTSTATUS status;
        struct wreplsrv_service *service;
 
+       task_server_set_title(task, "task[wreplsrv]");
+
        service = talloc_zero(task, struct wreplsrv_service);
        if (!service) {
                task_server_terminate(task, "wreplsrv_task_init: out of memory");
@@ -488,7 +496,7 @@ static void wreplsrv_task_init(struct task_server *task)
  */
 static NTSTATUS wreplsrv_init(struct event_context *event_ctx, const struct model_ops *model_ops)
 {
-       if (!lp_wins_support()) {
+       if (!lp_wins_support(global_loadparm)) {
                return NT_STATUS_OK;
        }