From: Michael Adam <obnox@samba.org>
Date: Fri, 17 Apr 2009 09:40:17 +0000 (+0200)
Subject: s3:registry: Prevent creation of keys containing the '/' character.
X-Git-Tag: tdb-1.1.5~958^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c023fea86d48ff2fd7990003ce2511b4263b762;p=thirdparty%2Fsamba.git

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
---

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 67767a2e561..c1a78c14dc7 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))) {