[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-782-g74385e9

[Michael Adam]

The branch, v3-4-test has been updated
       via  74385e90fa72b132088861d864cb275909ed7f6f (commit)
      from  4c8d90a077901f7901b8202abed54746679aa3a9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 74385e90fa72b132088861d864cb275909ed7f6f
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 17 11:40:17 2009 +0200

    s3:registry: Prevent creation of keys containing the '/' character.
    
    This creates a broken registry that can only be fixed with
    tdbtool, since the '/' sign is used as a key separator after
    normalization at a lower level.
    
    This makes e.g. "net conf setparm abc/def comment xyz" fail with
    WERR_INVALID_PARAM, which is much more desirable than a broken
    registry.tdb.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/registry/reg_api.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 67767a2..c1a78c1 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -459,6 +459,16 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
 	char *path, *end;
 	WERROR err;
 
+	/*
+	 * We must refuse to handle subkey-paths containing
+	 * a '/' character because at a lower level, after
+	 * normalization, '/' is treated as a key separator
+	 * just like '\\'.
+	 */
+	if (strchr(subkeypath, '/') != NULL) {
+		return WERR_INVALID_PARAM;
+	}
+
 	if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM;
 
 	if (!(path = talloc_strdup(mem_ctx, subkeypath))) {


-- 
Samba Shared Repository