[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.10_ctdb.58-3-gb16d063

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  b16d0635155ed8ef6cadba5d0faec15ddfd06736 (commit)
      from  9b5be0d38099deb117e9fca996bf032f35904079 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit b16d0635155ed8ef6cadba5d0faec15ddfd06736
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:
 source/registry/reg_api.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/registry/reg_api.c b/source/registry/reg_api.c
index c49ee03..0f12c78 100644
--- a/source/registry/reg_api.c
+++ b/source/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-CTDB repository