s4:lib/registry/ldb.c - don't use search filters for base searches

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

diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index 09f39f6f30e9abb107e3a8a69216f2c888ac7ce2..0aa476f7999a3413078994a3179946041c9b6622 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",
@@ -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",