Changeset 740 for vendor/current/source4/nbt_server/wins/winsdb.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/nbt_server/wins/winsdb.c (modified) (17 diffs)

vendor/current/source4/nbt_server/wins/winsdb.c ¶

@@ -24 +24 @@
 #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"
@@ -101 +101 @@
 
         ret = ldb_msg_add_empty(msg, "objectClass", LDB_FLAG_MOD_REPLACE, NULL);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
         ret = ldb_msg_add_string(msg, "objectClass", "winsMaxVersion");
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
         ret = ldb_msg_add_empty(msg, "maxVersion", LDB_FLAG_MOD_REPLACE, NULL);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
         ret = ldb_msg_add_fmt(msg, "maxVersion", "%llu", (long long)newMaxVersion);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
 
         ret = ldb_modify(wins_db, msg);
-        if (ret != 0) ret = ldb_add(wins_db, msg);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) ret = ldb_add(wins_db, msg);
+        if (ret != LDB_SUCCESS) goto failed;
 
         trans = ldb_transaction_commit(wins_db);
@@ -260 +260 @@
         }
 
-        *p = '\0';p++;
+        *p = '\0'; p++;
         addr->address = talloc_strdup(addr, address);
         if (!addr->address) {
@@ -320 +320 @@
                                    const char *attr_name, struct winsdb_addr *addr)
 {
-        struct ldb_val val;
         const char *str;
 
         if (rec->is_static) {
                 str = talloc_strdup(msg, addr->address);
-                if (!str) return -1;
+                if (!str) return LDB_ERR_OPERATIONS_ERROR;
         } else {
                 char *expire_time;
                 expire_time = ldb_timestring(msg, addr->expire_time);
-                if (!expire_time) return -1;
+                if (!expire_time) return LDB_ERR_OPERATIONS_ERROR;
                 str = talloc_asprintf(msg, "%s;winsOwner:%s;expireTime:%s;",
                                       addr->address, addr->wins_owner,
                                       expire_time);
                 talloc_free(expire_time);
-                if (!str) return -1;
-        }
-
-        val.data = discard_const_p(uint8_t, str);
-        val.length = strlen(str);
-
-        return ldb_msg_add_value(msg, attr_name, &val, NULL);
+                if (!str) return LDB_ERR_OPERATIONS_ERROR;
+        }
+
+        return ldb_msg_add_string(msg, attr_name, str);
 }
 
@@ -508 +504 @@
         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;
@@ -751 +747 @@
                                           TALLOC_CTX *mem_ctx)
 {
-        int i, ret=0;
+        int i, ret;
         size_t addr_count;
         const char *expire_time;
@@ -773 +769 @@
         msg->dn = winsdb_dn(msg, ldb, rec->name);
         if (msg->dn == NULL) goto failed;
-        ret |= ldb_msg_add_fmt(msg, "type", "0x%02X", rec->name->type);
+        ret = ldb_msg_add_fmt(msg, "type", "0x%02X", rec->name->type);
         if (rec->name->name && *rec->name->name) {
                 ret |= ldb_msg_add_string(msg, "name", rec->name->name);
@@ -795 +791 @@
                 ret |= ldb_msg_add_winsdb_addr(msg, rec, "address", rec->addresses[i]);
         }
-        ret |= ldb_msg_add_empty(msg, "registeredBy", 0, NULL);
         if (rec->registered_by) {
+                ret |= ldb_msg_add_empty(msg, "registeredBy", 0, NULL);
                 ret |= ldb_msg_add_string(msg, "registeredBy", rec->registered_by);
-                if (ret != 0) goto failed;
-        }
+        }
+        if (ret != LDB_SUCCESS) goto failed;
         return msg;
 
@@ -816 +812 @@
         TALLOC_CTX *tmp_ctx = talloc_new(wins_db);
         int trans = -1;
-        int ret = 0;
+        int ret;
 
         trans = ldb_transaction_start(wins_db);
@@ -833 +829 @@
         if (msg == NULL) goto failed;
         ret = ldb_add(wins_db, msg);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
 
         trans = ldb_transaction_commit(wins_db);
@@ -860 +856 @@
         int trans;
         int ret;
-        int i;
+        unsigned int i;
 
         trans = ldb_transaction_start(wins_db);
@@ -882 +878 @@
 
         ret = ldb_modify(wins_db, msg);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
 
         trans = ldb_transaction_commit(wins_db);
@@ -917 +913 @@
 
         ret = ldb_delete(wins_db, dn);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
 
         trans = ldb_transaction_commit(wins_db);
@@ -963 +959 @@
 
         ret = ldb_msg_add_string(msg, "@LIST", "wins_ldb");
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
 
         ret = ldb_add(h->ldb, msg);
-        if (ret != 0) goto failed;
+        if (ret != LDB_SUCCESS) goto failed;
 
         trans = ldb_transaction_commit(h->ldb);
@@ -976 +972 @@
         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;
 
@@ -1012 +1008 @@
         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);
@@ -1038 +1034 @@
         return NULL;
 }
+