r9209: - fixed the ldb registry backend to work with the new provision ldif

- default to ldb backend if none specified
(This used to be commit 8c3f57f7917efceb11b3b6a2ac76ec44968fbfb6)

diff --git a/source4/lib/registry/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb.c
index 5f4e296edfc56e4910307142cb46e63ffbac3d7b..8a5eac59c52647b28e722d87ed7435ebb9cce98f 100644 (file)
--- a/source4/lib/registry/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb.c
@@ -250,7 +250,7 @@ static WERROR ldb_open_hive(struct registry_hive *hive, struct registry_key **k)
        talloc_set_destructor (hive, ldb_free_hive);
        (*k)->name = talloc_strdup(*k, "");
        (*k)->backend_data = kd = talloc_zero(*k, struct ldb_key_data);
-       kd->dn = talloc_strdup(*k, "hive=");
+       kd->dn = talloc_strdup(*k, "hive=NONE");
        
 
        return WERR_OK;

diff --git a/source4/lib/registry/reg_samba.c b/source4/lib/registry/reg_samba.c
index 7188109daa83bca8a49701094fe654b1afe86ec2..3c9ae3f4153a46193619595bbb7d227aea9babdf 100644 (file)
--- a/source4/lib/registry/reg_samba.c
+++ b/source4/lib/registry/reg_samba.c
@@ -27,7 +27,8 @@ static WERROR reg_samba_get_predef (struct registry_context *ctx, uint32_t hkey,
 {
        WERROR error;
        const char *conf;
-       char *backend, *location;
+       char *backend;
+       const char *location;
        const char *hivename = reg_get_predef_name(hkey);
 
        *k = NULL;
@@ -38,12 +39,13 @@ static WERROR reg_samba_get_predef (struct registry_context *ctx, uint32_t hkey,
                return WERR_NOT_SUPPORTED;
        }
 
-       backend = talloc_strdup(NULL, conf);
-       location = strchr(backend, ':');
-
+       location = strchr(conf, ':');
        if (location) {
-               *location = '\0';
+               backend = talloc_strndup(ctx, conf, (int)(location - conf));
                location++;
+       } else {
+               backend = talloc_strdup(ctx, "ldb");
+               location = conf;
        }
 
        /* FIXME: Different hive backend for HKEY_CLASSES_ROOT: merged view of HKEY_LOCAL_MACHINE\Software\Classes