[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  6c52a37... s3-selftest: enable RPC-WINREG against Samba 3.
       via  b3765af... s4-smbtorture: skip NotifyChangeKeyValue test against s3 for now.
      from  12ae059... s4:torture/rpc/samr.c - add some decision possibility constants to some switch

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6c52a37ac191679245a1175f40ef961af3b3e0b1
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 5 11:06:46 2010 +0100

    s3-selftest: enable RPC-WINREG against Samba 3.
    
    Guenther

commit b3765afd3878856f8a4580de2da5032a81929ea2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 5 11:06:18 2010 +0100

    s4-smbtorture: skip NotifyChangeKeyValue test against s3 for now.
    
    Guenther

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

Summary of changes:
 source3/script/tests/test_posix_s3.sh |    2 +-
 source4/torture/rpc/winreg.c          |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 8099617..eb78de7 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -41,7 +41,7 @@ rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG"
 rpc="$rpc RPC-SAMBA3-GETALIASMEMBERSHIP-0"
 rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-rpc="$rpc RPC-SVCCTL RPC-NTSVCS"
+rpc="$rpc RPC-SVCCTL RPC-NTSVCS RPC-WINREG"
 rpc="$rpc RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-SPOOLSS-NOTIFY RPC-SPOOLSS-PRINTER"
 rpc="$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES"
 rpc="$rpc RPC-LSA-PRIVILEGES "
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 93be45d..5f1a66b 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -87,6 +87,10 @@ static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p,
 	init_winreg_String(&r.in.string1, NULL);
 	init_winreg_String(&r.in.string2, NULL);
 
+	if (torture_setting_bool(tctx, "samba3", false)) {
+		torture_skip(tctx, "skipping NotifyChangeKeyValue test against Samba 3");
+	}
+
 	torture_assert_ntstatus_ok(tctx,
 				   dcerpc_winreg_NotifyChangeKeyValue(p, tctx, &r),
 				   "NotifyChangeKeyValue failed");


-- 
Samba Shared Repository