ldb: use #include <ldb.h> for ldb

[bbaumbach/samba-autobuild/.git] / source4 / nbt_server / wins / winsdb.c

diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index a502050299eb86e2b32e73a54c4fea1a435841d3..791ce957c7b1c0f943022640bc1dc67889dd595f 100644 (file)
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -23,8 +23,8 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "ldb_wrap.h"
@@ -319,7 +319,6 @@ failed:
 static int ldb_msg_add_winsdb_addr(struct ldb_message *msg, struct winsdb_record *rec,
                                   const char *attr_name, struct winsdb_addr *addr)
 {
-       struct ldb_val val;
        const char *str;
 
        if (rec->is_static) {
@@ -336,10 +335,7 @@ static int ldb_msg_add_winsdb_addr(struct ldb_message *msg, struct winsdb_record
                if (!str) return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       val.data = discard_const_p(uint8_t, str);
-       val.length = strlen(str);
-
-       return ldb_msg_add_value(msg, attr_name, &val, NULL);
+       return ldb_msg_add_string(msg, attr_name, str);
 }
 
 struct winsdb_addr **winsdb_addr_list_make(TALLOC_CTX *mem_ctx)
@@ -507,7 +503,7 @@ add_new_addr:
 
        addresses[len+1] = NULL;
 
-       ldb_qsort(addresses, len+1 , sizeof(addresses[0]), h, (ldb_qsort_cmp_fn_t)winsdb_addr_sort_list);
+       LDB_TYPESAFE_QSORT(addresses, len+1, h, winsdb_addr_sort_list);
 
        return addresses;
 }
@@ -859,7 +855,7 @@ uint8_t winsdb_modify(struct winsdb_handle *h, struct winsdb_record *rec, uint32
        TALLOC_CTX *tmp_ctx = talloc_new(wins_db);
        int trans;
        int ret;
-       int i;
+       unsigned int i;
 
        trans = ldb_transaction_start(wins_db);
        if (trans != LDB_SUCCESS) goto failed;
@@ -975,12 +971,12 @@ static bool winsdb_check_or_add_module_list(struct tevent_context *ev_ctx,
        talloc_free(h->ldb);
        h->ldb = NULL;
 
-       if (lp_parm_bool(lp_ctx, NULL,"winsdb", "nosync", false)) {
+       if (lpcfg_parm_bool(lp_ctx, NULL,"winsdb", "nosync", false)) {
                flags |= LDB_FLG_NOSYNC;
        }
 
-       h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lock_path(h, lp_ctx, lp_wins_url(lp_ctx)),
-                                 NULL, NULL, flags, NULL);
+       h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lock_path(h, lp_ctx, lpcfg_wins_url(lp_ctx)),
+                                 NULL, NULL, flags);
        if (!h->ldb) goto failed;
 
        talloc_free(tmp_ctx);
@@ -1011,16 +1007,16 @@ struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx,
        h = talloc_zero(mem_ctx, struct winsdb_handle);
        if (!h) return NULL;
 
-       if (lp_parm_bool(lp_ctx, NULL,"winsdb", "nosync", false)) {
+       if (lpcfg_parm_bool(lp_ctx, NULL,"winsdb", "nosync", false)) {
                flags |= LDB_FLG_NOSYNC;
        }
 
-       h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lock_path(h, lp_ctx, lp_wins_url(lp_ctx)),
-                                 NULL, NULL, flags, NULL);
-       if (!h->ldb) goto failed;       
+       h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lock_path(h, lp_ctx, lpcfg_wins_url(lp_ctx)),
+                                 NULL, NULL, flags);
+       if (!h->ldb) goto failed;
 
        h->caller = caller;
-       h->hook_script = lp_wins_hook(lp_ctx);
+       h->hook_script = lpcfg_wins_hook(lp_ctx);
 
        h->local_owner = talloc_strdup(h, owner);
        if (!h->local_owner) goto failed;