r9387: regedit uses "New Key #nn" for newly created keys, which conflicts with the...

DN rules in ldb. Escape the DN components to cope.

Simo, sorry for making a change in ldb_dn.c while you have changes
pending. Please feel free to revert these and switch reg_backend_ldb.c
to use the new dn construction code.

diff --git a/source/lib/ldb/common/ldb_dn.c b/source/lib/ldb/common/ldb_dn.c
index 5dcb540fa137748416abf91bc35904d89aff15a9..d13238cc170c0949e2a6f008e3f131cbb30b004d 100644 (file)
--- a/source/lib/ldb/common/ldb_dn.c
+++ b/source/lib/ldb/common/ldb_dn.c
@@ -56,7 +56,7 @@ static int ldb_dn_is_valid_attribute_name(const char *name)
        return 1;
 }
 
-static char *ldb_dn_escape_value(void *mem_ctx, struct ldb_val value)
+char *ldb_dn_escape_value(void *mem_ctx, struct ldb_val value)
 {
        const char *p, *s, *src;
        char *d, *dst;

diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h
index 7399b8ffe7232b8da8a36ddc3b5b0e0290818d10..fdf5dc8d91940ec05f4a5b444bc00e69ed0b5cd2 100644 (file)
--- a/source/lib/ldb/include/ldb.h
+++ b/source/lib/ldb/include/ldb.h
@@ -342,6 +342,7 @@ int ldb_attrib_add_handlers(struct ldb_context *ldb,
 
 int ldb_dn_cmp(struct ldb_context *ldb, const char *dn1, const char *dn2);
 int ldb_attr_cmp(const char *dn1, const char *dn2);
+char *ldb_dn_escape_value(void *mem_ctx, struct ldb_val value);
 
 /* case-fold a DN */
 char *ldb_dn_fold(void * mem_ctx,

diff --git a/source/lib/registry/reg_backend_ldb.c b/source/lib/registry/reg_backend_ldb.c
index 784d8ac6fa4667ddab93eb70a82ac6766d9e7263..114614597f6ad7a8e82e01a07371f6813ae34f90 100644 (file)
--- a/source/lib/registry/reg_backend_ldb.c
+++ b/source/lib/registry/reg_backend_ldb.c
@@ -126,12 +126,24 @@ static char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, struct registry_key *from, con
        while(mypath) {
                char *keyname;
                begin = strrchr(mypath, '\\');
+               struct ldb_val val;
+               char *key;
 
-               if(begin) keyname = begin + 1;
+               if (begin) keyname = begin + 1;
                else keyname = mypath;
 
-               if(strlen(keyname))
-                       ret = talloc_asprintf_append(ret, "key=%s,", keyname);
+               val.data = keyname;
+               val.length = strlen(keyname);
+               
+               key = ldb_dn_escape_value(mem_ctx, val);
+               if (key == NULL) {
+                       return NULL;
+               }
+
+               if (strlen(key))
+                       ret = talloc_asprintf_append(ret, "key=%s,", key);
+
+               talloc_free(key);
                        
                if(begin) {
                        *begin = '\0';