[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-3-36-ga6dc4b5

[Karolin Seeger]

The branch, v3-3-stable has been updated
       via  a6dc4b5dde00a1a33a96b48b592f8368dec5883c (commit)
       via  c5920e257dc2066e447620cc85f02241d408dcab (commit)
       via  5f674ca5172001aff4b90f0f758e0767894ab29a (commit)
      from  dd02789ce82b2ed7e60a2168e1b0bcb6656d0ce6 (commit)

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


- Log -----------------------------------------------------------------
commit a6dc4b5dde00a1a33a96b48b592f8368dec5883c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Apr 17 16:15:08 2009 +0200

    VERSION: Raise version number up to 3.3.4.
    
    Karolin
    (cherry picked from commit a70f2928c0ceb625424af56b96ac76b74c04fa12)

commit c5920e257dc2066e447620cc85f02241d408dcab
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 15:46:36 2009 +0200

    s3-test: enable RPC-LSA-LOOKUPSIDS and RPC-JOIN during make test.
    
    Guenther
    (cherry picked from commit 79321cad54a4303abc27766101ffb52f50d64430)

commit 5f674ca5172001aff4b90f0f758e0767894ab29a
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
    (cherry picked from commit 943b33587c9905e0b6b6ee090fe9bf9bdfc77465)

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

Summary of changes:
 source/VERSION                       |    2 +-
 source/registry/reg_api.c            |   10 ++++++++++
 source/script/tests/test_posix_s3.sh |    1 +
 3 files changed, 12 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/VERSION b/source/VERSION
index 65dadee..56d64fa 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=3
-SAMBA_VERSION_RELEASE=3
+SAMBA_VERSION_RELEASE=4
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
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))) {
diff --git a/source/script/tests/test_posix_s3.sh b/source/script/tests/test_posix_s3.sh
index 3e99986..3bd9d1c 100755
--- a/source/script/tests/test_posix_s3.sh
+++ b/source/script/tests/test_posix_s3.sh
@@ -38,6 +38,7 @@ raw="$raw RAW-SAMBA3ROOTDIRFID"
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
+rpc="$rpc RPC-LSA-LOOKUPSIDS RPC-JOIN"
 
 # NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
 # config to allow guest access. I'm not sure whether this would break other


-- 
Samba Shared Repository