s4/registry/py: use unsigned ParseTuple format for unsigned value

[sfrench/samba-autobuild/.git] / source4 / lib / registry / ldb.c

diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index 09f39f6f30e9abb107e3a8a69216f2c888ac7ce2..8bb6fd5c10f2006352e846552026d6d1745311b1 100644 (file)
--- a/source4/lib/registry/ldb.c
+++ b/source4/lib/registry/ldb.c
@@ -20,8 +20,8 @@
 
 #include "includes.h"
 #include "registry.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "ldb_wrap.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "param/param.h"
@@ -65,7 +65,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx,
                        /* The data should be provided as UTF16 string */
                        convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16,
                                              val->data, val->length,
-                                             (void **)&data->data, &data->length, false);
+                                             (void **)&data->data, &data->length);
                } else {
                        data->data = NULL;
                        data->length = 0;
@@ -159,8 +159,7 @@ static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx,
                        /* The data is provided as UTF16 string */
                        ret2 = convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8,
                                                     (void *)data.data, data.length,
-                                                    (void **)&val->data, &val->length,
-                                                    false);
+                                                    (void **)&val->data, &val->length);
                        if (ret2) {
                                ret = ldb_msg_add_value(msg, "data", val, NULL);
                        } else {
@@ -409,7 +408,8 @@ static WERROR ldb_get_default_value(TALLOC_CTX *mem_ctx,
        struct ldb_result *res;
        int ret;
 
-       ret = ldb_search(c, mem_ctx, &res, kd->dn, LDB_SCOPE_BASE, attrs, "(dn=*)");
+       ret = ldb_search(c, mem_ctx, &res, kd->dn, LDB_SCOPE_BASE, attrs,
+                        NULL);
 
        if (ret != LDB_SUCCESS) {
                DEBUG(0, ("Error getting default value for '%s': %s\n",
@@ -419,7 +419,7 @@ static WERROR ldb_get_default_value(TALLOC_CTX *mem_ctx,
 
        if (res->count == 0 || res->msgs[0]->num_elements == 0) {
                talloc_free(res);
-               return WERR_BADFILE;
+               return WERR_FILE_NOT_FOUND;
        }
 
        if ((data_type != NULL) && (data != NULL)) {
@@ -488,7 +488,7 @@ static WERROR ldb_get_value(TALLOC_CTX *mem_ctx, struct hive_key *k,
                }
        }
 
-       return WERR_BADFILE;
+       return WERR_FILE_NOT_FOUND;
 }
 
 static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
@@ -504,7 +504,8 @@ static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
        ldb_path = reg_path_to_ldb(mem_ctx, h, name, NULL);
        W_ERROR_HAVE_NO_MEMORY(ldb_path);
 
-       ret = ldb_search(c, mem_ctx, &res, ldb_path, LDB_SCOPE_BASE, NULL, "(key=*)");
+       ret = ldb_search(c, mem_ctx, &res, ldb_path, LDB_SCOPE_BASE, NULL,
+                        NULL);
 
        if (ret != LDB_SUCCESS) {
                DEBUG(3, ("Error opening key '%s': %s\n",
@@ -514,7 +515,7 @@ static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
                DEBUG(3, ("Key '%s' not found\n",
                        ldb_dn_get_linearized(ldb_path)));
                talloc_free(res);
-               return WERR_BADFILE;
+               return WERR_FILE_NOT_FOUND;
        }
 
        newkd = talloc_zero(mem_ctx, struct ldb_key_data);
@@ -544,7 +545,7 @@ WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
        struct ldb_message *attrs_msg;
 
        if (location == NULL)
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
 
        wrap = ldb_wrap_connect(parent_ctx, ev_ctx, lp_ctx,
                                location, session_info, credentials, 0);
@@ -645,14 +646,23 @@ static WERROR ldb_del_value(TALLOC_CTX *mem_ctx, struct hive_key *key,
                W_ERROR_HAVE_NO_MEMORY(msg);
                msg->dn = ldb_dn_copy(msg, kd->dn);
                W_ERROR_HAVE_NO_MEMORY(msg->dn);
-               ldb_msg_add_empty(msg, "data", LDB_FLAG_MOD_DELETE, NULL);
-               ldb_msg_add_empty(msg, "type", LDB_FLAG_MOD_DELETE, NULL);
+               ret = ldb_msg_add_empty(msg, "data", LDB_FLAG_MOD_DELETE, NULL);
+               if (ret != LDB_SUCCESS) {
+                       return WERR_FOOBAR;
+               }
+               ret = ldb_msg_add_empty(msg, "type", LDB_FLAG_MOD_DELETE,
+                                       NULL);
+               if (ret != LDB_SUCCESS) {
+                       return WERR_FOOBAR;
+               }
 
                ret = ldb_modify(kd->ldb, msg);
 
                talloc_free(msg);
 
-               if (ret != LDB_SUCCESS) {
+               if (ret == LDB_ERR_NO_SUCH_ATTRIBUTE) {
+                       return WERR_FILE_NOT_FOUND;
+               } else if (ret != LDB_SUCCESS) {
                        DEBUG(1, ("ldb_del_value: %s\n", ldb_errstring(kd->ldb)));
                        return WERR_FOOBAR;
                }
@@ -671,7 +681,7 @@ static WERROR ldb_del_value(TALLOC_CTX *mem_ctx, struct hive_key *key,
                talloc_free(childdn);
 
                if (ret == LDB_ERR_NO_SUCH_OBJECT) {
-                       return WERR_BADFILE;
+                       return WERR_FILE_NOT_FOUND;
                } else if (ret != LDB_SUCCESS) {
                        DEBUG(1, ("ldb_del_value: %s\n", ldb_errstring(kd->ldb)));
                        return WERR_FOOBAR;
@@ -896,7 +906,7 @@ static WERROR ldb_get_key_info(TALLOC_CTX *mem_ctx,
         * remain { NULL, 0 }. */
        werr = ldb_get_default_value(mem_ctx, key, NULL, &default_value_type,
                                     &default_value);
-       if ((!W_ERROR_IS_OK(werr)) && (!W_ERROR_EQUAL(werr, WERR_BADFILE))) {
+       if ((!W_ERROR_IS_OK(werr)) && (!W_ERROR_EQUAL(werr, WERR_FILE_NOT_FOUND))) {
                return werr;
        }