From ae50385d524d8cb4831d8eb0c45feb4d04437f28 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Tue, 29 Jun 2010 18:08:47 +0200 Subject: s4:registry - on key add operations we have to handle with paths not always only a name Recursive key generations are allowed. --- source4/lib/registry/interface.c | 4 ++-- source4/lib/registry/registry.h | 2 +- source4/lib/registry/rpc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/registry/interface.c b/source4/lib/registry/interface.c index c5d5ce8d5f..07e606d05b 100644 --- a/source4/lib/registry/interface.c +++ b/source4/lib/registry/interface.c @@ -202,7 +202,7 @@ _PUBLIC_ WERROR reg_key_del(TALLOC_CTX *mem_ctx, struct registry_key *parent, */ _PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, struct registry_key *parent, - const char *name, const char *key_class, + const char *path, const char *key_class, struct security_descriptor *desc, struct registry_key **newkey) { @@ -215,7 +215,7 @@ _PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, return WERR_NOT_SUPPORTED; } - return parent->context->ops->create_key(mem_ctx, parent, name, + return parent->context->ops->create_key(mem_ctx, parent, path, key_class, desc, newkey); } diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index 76247528b2..8fc025777b 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -69,7 +69,7 @@ struct hive_operations { * Add a new key. */ WERROR (*add_key) (TALLOC_CTX *ctx, - const struct hive_key *parent_key, const char *name, + const struct hive_key *parent_key, const char *path, const char *classname, struct security_descriptor *desc, struct hive_key **key); diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c index 7948f7cb40..bc49045ef7 100644 --- a/source4/lib/registry/rpc.c +++ b/source4/lib/registry/rpc.c @@ -331,7 +331,7 @@ static WERROR rpc_get_subkey_by_index(TALLOC_CTX *mem_ctx, } static WERROR rpc_add_key(TALLOC_CTX *mem_ctx, - struct registry_key *parent, const char *name, + struct registry_key *parent, const char *path, const char *key_class, struct security_descriptor *sec, struct registry_key **key) @@ -344,7 +344,7 @@ static WERROR rpc_add_key(TALLOC_CTX *mem_ctx, ZERO_STRUCT(r); r.in.handle = &parentkd->pol; - r.in.name.name = name; + r.in.name.name = path; r.in.keyclass.name = NULL; r.in.options = 0; r.in.access_mask = 0x02000000; -- cgit