r24667: Finally merge the registry improvements that Wilco Baan Hofman and I have

been working on for at least half a year now. Contains the following
improvements:

 * proper layering (finally!) for the registry library. Distinction is
   now made between 'real' backends (local, remote, wine, etc) and
   the low-level hive backends (regf, creg, ldb, ...) that are only used
   by the local registry backend
 * tests for all important hive and registry operations
 * re-enable RPC-WINREG tests (still needs more work though, as
							   some return values aren't checked yet)
 * write support for REGF files
 * dir backend now supports setting/reading values, creating keys
 * support for storing security descriptors
 * remove CREG backend as it was incomplete, didn't match the data model
   and wasn't used at all anyway
 * support for parsing ADM files as used by the policy editor (see lib/policy)
 * support for parsing PREG files (format used by .POL files)
 * new streaming interface for registry diffs (improves speed and memory usage
	for regdiff/regpatch significantly)

   ... and fixes a large number of bugs in the registry code
(This used to be commit 7a1eec6358bc863dfc671c542b7185d3e39d7b5a)

7 files changed, 316 insertions, 364 deletions

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index c089cfd887..1364028ab7 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -23,6 +23,9 @@ OBJ_FILES = \
 		../../lib/socket_wrapper/testsuite.o \
 		irpc.o \
 		../../lib/registry/tests/generic.o \
+		../../lib/registry/tests/hive.o \
+		../../lib/registry/tests/diff.o \
+		../../lib/registry/tests/registry.o \
 		resolve.o \
 		../../lib/util/tests/strlist.o \
 		../../lib/util/tests/file.o \
diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index 226f016c55..d7c956efd6 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -457,7 +457,8 @@ static const uint8_t getkeysecurity_in_data[] = {
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static bool getkeysecurity_in_check(struct torture_context *tctx, struct winreg_GetKeySecurity *r)
+static bool getkeysecurity_in_check(struct torture_context *tctx, 
+									struct winreg_GetKeySecurity *r)
 {
 	/* FIXME: Handle */
 	torture_assert_int_equal(tctx, r->in.sec_info, 2, "sec info");
@@ -474,7 +475,8 @@ static const uint8_t getkeysecurity_out_data[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static bool getkeysecurity_out_check(struct torture_context *tctx, struct winreg_GetKeySecurity *r)
+static bool getkeysecurity_out_check(struct torture_context *tctx, 
+									 struct winreg_GetKeySecurity *r)
 {
 	torture_assert_int_equal(tctx, r->in.sd->size, 20, "sd size");
 	torture_assert_int_equal(tctx, r->in.sd->len, 20, "sd len");
diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index b20d25d1ef..83462d3328 100644
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -575,11 +575,11 @@ static bool test_handles_drsuapi(struct torture_context *torture)
 }
 
 
-struct torture_suite *torture_rpc_handles(void)
+struct torture_suite *torture_rpc_handles(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite;
 
-	suite = torture_suite_create(talloc_autofree_context(), "HANDLES");
+	suite = torture_suite_create(mem_ctx, "HANDLES");
 	torture_suite_add_simple_test(suite, "lsarpc", test_handles_lsa);
 	torture_suite_add_simple_test(suite, "lsarpc-shared", test_handles_lsa_shared);
 	torture_suite_add_simple_test(suite, "samr", test_handles_samr);
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 250945a8a2..12ace3e7d2 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -134,6 +134,17 @@ static bool torture_rpc_wrap_test(struct torture_context *tctx,
 	return fn(tctx, (struct dcerpc_pipe *)tcase->data);
 }
 
+static bool torture_rpc_wrap_test_ex(struct torture_context *tctx, 
+								  struct torture_tcase *tcase,
+								  struct torture_test *test)
+{
+	bool (*fn) (struct torture_context *, struct dcerpc_pipe *, const void *);
+
+	fn = test->fn;
+
+	return fn(tctx, (struct dcerpc_pipe *)tcase->data, test->data);
+}
+
 _PUBLIC_ struct torture_test *torture_rpc_tcase_add_test(
 					struct torture_tcase *tcase, 
 					const char *name, 
@@ -155,6 +166,29 @@ _PUBLIC_ struct torture_test *torture_rpc_tcase_add_test(
 	return test;
 }
 
+_PUBLIC_ struct torture_test *torture_rpc_tcase_add_test_ex(
+					struct torture_tcase *tcase, 
+					const char *name, 
+					bool (*fn) (struct torture_context *, struct dcerpc_pipe *,
+								void *),
+					void *userdata)
+{
+	struct torture_test *test;
+
+	test = talloc(tcase, struct torture_test);
+
+	test->name = talloc_strdup(test, name);
+	test->description = NULL;
+	test->run = torture_rpc_wrap_test_ex;
+	test->dangerous = false;
+	test->data = userdata;
+	test->fn = fn;
+
+	DLIST_ADD(tcase->tests, test);
+
+	return test;
+}
+
 NTSTATUS torture_rpc_init(void)
 {
 	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "RPC");
@@ -173,7 +207,8 @@ NTSTATUS torture_rpc_init(void)
 	torture_suite_add_suite(suite, torture_rpc_eventlog());
 	torture_suite_add_suite(suite, torture_rpc_atsvc());
 	torture_suite_add_suite(suite, torture_rpc_wkssvc());
-	torture_suite_add_suite(suite, torture_rpc_handles());
+	torture_suite_add_suite(suite, torture_rpc_handles(suite));
+	torture_suite_add_suite(suite, torture_rpc_winreg(suite));
 	torture_suite_add_simple_test(suite, "SPOOLSS", torture_rpc_spoolss);
 	torture_suite_add_simple_test(suite, "SAMR", torture_rpc_samr);
 	torture_suite_add_simple_test(suite, "SAMR-USERS", torture_rpc_samr_users);
@@ -186,7 +221,6 @@ NTSTATUS torture_rpc_init(void)
 	torture_suite_add_simple_test(suite, "SRVSVC", torture_rpc_srvsvc);
 	torture_suite_add_simple_test(suite, "SVCCTL", torture_rpc_svcctl);
 	torture_suite_add_simple_test(suite, "EPMAPPER", torture_rpc_epmapper);
-	torture_suite_add_simple_test(suite, "WINREG", torture_rpc_winreg);
 	torture_suite_add_simple_test(suite, "INITSHUTDOWN", torture_rpc_initshutdown);
 	torture_suite_add_simple_test(suite, "OXIDRESOLVE", torture_rpc_oxidresolve);
 	torture_suite_add_simple_test(suite, "REMACT", torture_rpc_remact);
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index ac5b39b1e6..d433406c58 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -3,7 +3,7 @@
    test suite for winreg rpc operations
 
    Copyright (C) Tim Potter 2003
-   Copyright (C) Jelmer Vernooij 2004
+   Copyright (C) Jelmer Vernooij 2004-2007
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,7 +32,9 @@
 #define TEST_KEY3 TEST_KEY_BASE "\\with a subkey"
 #define TEST_SUBKEY TEST_KEY3 "\\subkey"
 
-static void init_initshutdown_String(TALLOC_CTX *mem_ctx, struct initshutdown_String *name, const char *s)
+static void init_initshutdown_String(TALLOC_CTX *mem_ctx, 
+									 struct initshutdown_String *name, 
+									 const char *s)
 {
 	name->name = talloc(mem_ctx, struct initshutdown_String_sub);
 	name->name->name = s;
@@ -50,40 +52,30 @@ static void init_winreg_String(struct winreg_String *name, const char *s)
 	}
 }
 
-static bool test_GetVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_GetVersion(struct dcerpc_pipe *p, 
+				struct torture_context *tctx,
 			    struct policy_handle *handle)
 {
-	NTSTATUS status;
 	struct winreg_GetVersion r;
 	uint32_t v;
-	printf("\ntesting GetVersion\n");
 
 	ZERO_STRUCT(r);
 	r.in.handle = handle;
 	r.out.version = &v;
 
-	status = dcerpc_winreg_GetVersion(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("GetVersion failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_GetVersion(p, tctx, &r),
+							   "GetVersion failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("GetVersion failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "GetVersion failed");
 
 	return true;
 }
 
-static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p, 
+									  struct torture_context *tctx, 
 									  struct policy_handle *handle)
 {
 	struct winreg_NotifyChangeKeyValue r;
-	NTSTATUS status;
-
-	printf("\ntesting NotifyChangeKeyValue\n");
 
 	r.in.handle = handle;
 	r.in.watch_subtree = 1;
@@ -92,32 +84,27 @@ static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx
 	init_winreg_String(&r.in.string1, NULL);
 	init_winreg_String(&r.in.string2, NULL);
 
-	status = dcerpc_winreg_NotifyChangeKeyValue(p, mem_ctx, &r);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("NotifyChangeKeyValue failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, 
+							   dcerpc_winreg_NotifyChangeKeyValue(p, tctx, &r),
+							   "NotifyChangeKeyValue failed");
 
 	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("NotifyChangeKeyValue failed - %s - not considering\n", win_errstr(r.out.result));
+		torture_comment(tctx, 
+						"NotifyChangeKeyValue failed - %s - not considering\n", win_errstr(r.out.result));
 		return true;
 	}
 
 	return true;
 }
 
-static bool test_CreateKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_CreateKey(struct dcerpc_pipe *p, struct torture_context *tctx,
 			  struct policy_handle *handle, const char *name, 
 			   const char *class)
 {
 	struct winreg_CreateKey r;
 	struct policy_handle newhandle;
-	NTSTATUS status;
 	enum winreg_CreateAction action_taken = 0;
 
-	printf("\ntesting CreateKey\n");
-
 	r.in.handle = handle;
 	r.out.new_handle = &newhandle;
 	init_winreg_String(&r.in.name, name);	
@@ -127,17 +114,10 @@ static bool test_CreateKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.action_taken = r.out.action_taken = &action_taken;
 	r.in.secdesc = NULL;
 
-	status = dcerpc_winreg_CreateKey(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("CreateKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CreateKey(p, tctx, &r),
+		"CreateKey failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("CreateKey failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx,  r.out.result, "CreateKey failed");
 
 	return true;
 }
@@ -146,18 +126,18 @@ static bool test_CreateKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 /*
   createkey testing with a SD
 */
-static bool test_CreateKey_sd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_CreateKey_sd(struct dcerpc_pipe *p, 
+							  struct torture_context *tctx,
 			      struct policy_handle *handle, const char *name, 
 			      const char *class, struct policy_handle *newhandle)
 {
 	struct winreg_CreateKey r;
-	NTSTATUS status;
 	enum winreg_CreateAction action_taken = 0;
 	struct security_descriptor *sd;
 	DATA_BLOB sdblob;
 	struct winreg_SecBuf secbuf;
 
-	sd = security_descriptor_create(mem_ctx,
+	sd = security_descriptor_create(tctx,
 					NULL, NULL,
 					SID_NT_AUTHENTICATED_USERS,
 					SEC_ACE_TYPE_ACCESS_ALLOWED,
@@ -165,12 +145,10 @@ static bool test_CreateKey_sd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 					SEC_ACE_FLAG_OBJECT_INHERIT,
 					NULL);
 
-	status = ndr_push_struct_blob(&sdblob, mem_ctx, sd, 
-				      (ndr_push_flags_fn_t)ndr_push_security_descriptor);
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("Failed to push security_descriptor ?!\n");
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, 
+		ndr_push_struct_blob(&sdblob, tctx, sd, 
+				      (ndr_push_flags_fn_t)ndr_push_security_descriptor),
+				"Failed to push security_descriptor ?!\n");
 
 	secbuf.sd.data = sdblob.data;
 	secbuf.sd.len = sdblob.length;
@@ -178,8 +156,6 @@ static bool test_CreateKey_sd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	secbuf.length = sdblob.length-10;
 	secbuf.inherit = 0;
 
-	printf("\ntesting CreateKey with sd\n");
-
 	r.in.handle = handle;
 	r.out.new_handle = newhandle;
 	init_winreg_String(&r.in.name, name);	
@@ -189,59 +165,42 @@ static bool test_CreateKey_sd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.action_taken = r.out.action_taken = &action_taken;
 	r.in.secdesc = &secbuf;
 
-	status = dcerpc_winreg_CreateKey(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("CreateKey with sd failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CreateKey(p, tctx, &r),
+		"CreateKey with sd failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("CreateKey with sd failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "CreateKey with sd failed");
 
 	return true;
 }
 
-static bool test_GetKeySecurity(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_GetKeySecurity(struct dcerpc_pipe *p, 
+								struct torture_context *tctx,
 			  struct policy_handle *handle)
 {
-	NTSTATUS status;
 	struct winreg_GetKeySecurity r;
 	struct security_descriptor sd;
 	DATA_BLOB sdblob;
 
-	printf("\ntesting GetKeySecurity\n");
-
 	ZERO_STRUCT(r);
 
 	r.in.handle = handle;
-	r.in.sd = r.out.sd = talloc_zero(mem_ctx, struct KeySecurityData);
+	r.in.sd = r.out.sd = talloc_zero(tctx, struct KeySecurityData);
 	r.in.sd->size = 0x1000;
 	r.in.sec_info = SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL;
 
-	status = dcerpc_winreg_GetKeySecurity(p, mem_ctx, &r);
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_GetKeySecurity(p, tctx, &r),
+		"GetKeySecurity failed");
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("GetKeySecurity failed - %s\n", nt_errstr(status));
-		return false;
-	}
-
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("GetKeySecurity failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "GetKeySecurity failed");
 
 	sdblob.data = r.out.sd->data;
 	sdblob.length = r.out.sd->len;
 
-	status = ndr_pull_struct_blob(&sdblob, mem_ctx, &sd, 
-				      (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("pull_security_descriptor failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, 
+		ndr_pull_struct_blob(&sdblob, tctx, &sd, 
+				      (ndr_pull_flags_fn_t)ndr_pull_security_descriptor),
+			"pull_security_descriptor failed");
+
 	if (p->conn->flags & DCERPC_DEBUG_PRINT_OUT) {
 		NDR_PRINT_DEBUG(security_descriptor, &sd);
 	}
@@ -249,88 +208,57 @@ static bool test_GetKeySecurity(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	return true;
 }
 
-static bool test_CloseKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_CloseKey(struct dcerpc_pipe *p, struct torture_context *tctx, 
 			  struct policy_handle *handle)
 {
-	NTSTATUS status;
 	struct winreg_CloseKey r;
 
-	printf("\ntesting CloseKey\n");
-
 	r.in.handle = r.out.handle = handle;
 
-	status = dcerpc_winreg_CloseKey(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("CloseKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CloseKey(p, tctx, &r),
+							   "CloseKey failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("CloseKey failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "CloseKey failed");
 
 	return true;
 }
 
-static bool test_FlushKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_FlushKey(struct dcerpc_pipe *p, struct torture_context *tctx, 
 			  struct policy_handle *handle)
 {
-	NTSTATUS status;
 	struct winreg_FlushKey r;
 
-	printf("\ntesting FlushKey\n");
-
 	r.in.handle = handle;
 
-	status = dcerpc_winreg_FlushKey(p, mem_ctx, &r);
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_FlushKey(p, tctx, &r),
+			"FlushKey failed");
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("FlushKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
-
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("FlushKey failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "FlushKey failed");
 
 	return true;
 }
 
-static bool test_OpenKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_OpenKey(struct dcerpc_pipe *p, struct torture_context *tctx,
 			 struct policy_handle *hive_handle,
 			 const char *keyname, struct policy_handle *key_handle)
 {
-	NTSTATUS status;
 	struct winreg_OpenKey r;
 
-	printf("\ntesting OpenKey\n");
-
 	r.in.parent_handle = hive_handle;
 	init_winreg_String(&r.in.keyname, keyname);
 	r.in.unknown = 0x00000000;
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = key_handle;
 
-	status = dcerpc_winreg_OpenKey(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("OpenKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
-
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("OpenKey failed - %s\n", win_errstr(r.out.result));
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_OpenKey(p, tctx, &r),
+				"OpenKey failed");
 
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "OpenKey failed");
 
 	return true;
 }
 
-static bool test_Cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_Cleanup(struct dcerpc_pipe *p, struct torture_context *tctx,
 			 struct policy_handle *handle, const char *key)
 {
 	struct winreg_DeleteKey r;
@@ -338,34 +266,25 @@ static bool test_Cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.handle = handle;
 
 	init_winreg_String(&r.in.key, key);
-	dcerpc_winreg_DeleteKey(p, mem_ctx, &r);
+	dcerpc_winreg_DeleteKey(p, tctx, &r);
 
 	return true;
 }
 
 
-static bool test_DeleteKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_DeleteKey(struct dcerpc_pipe *p, struct torture_context *tctx,
 			   struct policy_handle *handle, const char *key)
 {
 	NTSTATUS status;
 	struct winreg_DeleteKey r;
 
-	printf("\ntesting DeleteKey\n");
-
 	r.in.handle = handle;
 	init_winreg_String(&r.in.key, key);	
 
-	status = dcerpc_winreg_DeleteKey(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("DeleteKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	status = dcerpc_winreg_DeleteKey(p, tctx, &r);
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("DeleteKey failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, status, "DeleteKey failed");
+	torture_assert_werr_ok(tctx, r.out.result, "DeleteKey failed");
 
 	return true;
 }
@@ -373,44 +292,33 @@ static bool test_DeleteKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 /* DeleteKey on a key with subkey(s) should
  * return WERR_ACCESS_DENIED. */
 static bool test_DeleteKeyWithSubkey(struct dcerpc_pipe *p, 
-				     TALLOC_CTX* mem_ctx,
+				     struct torture_context *tctx,
 				     struct policy_handle *handle, const char *key)
 {
-	NTSTATUS status;
 	struct winreg_DeleteKey r;
 
-	printf("\ntesting DeleteKeyWithSubkey\n");
-
 	r.in.handle = handle;
 	init_winreg_String(&r.in.key, key);
 
-	status = dcerpc_winreg_DeleteKey(p, mem_ctx, &r);
+	torture_assert_ntstatus_ok(tctx, dcerpc_winreg_DeleteKey(p, tctx, &r),
+							   "DeleteKeyWithSubkey failed");
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("DeleteKeyWithSubkey failed  - %s\n", nt_errstr(status));
-		return false;
-	}
-
-	if (!W_ERROR_EQUAL(r.out.result, WERR_ACCESS_DENIED)) {
-		printf("DeleteKeyWithSubkey failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_equal(tctx, r.out.result, WERR_ACCESS_DENIED, 
+			"DeleteKeyWithSubkey failed");
 
 	return true;
 }
 
-static bool test_QueryInfoKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_QueryInfoKey(struct dcerpc_pipe *p, 
+							  struct torture_context *tctx,
 			      struct policy_handle *handle, char *class)
 {
-	NTSTATUS status;
 	struct winreg_QueryInfoKey r;
 	uint32_t num_subkeys, max_subkeylen, max_subkeysize,
 		num_values, max_valnamelen, max_valbufsize,
 		secdescsize;
 	NTTIME last_changed_time;
 
-	printf("\ntesting QueryInfoKey\n");
-
 	ZERO_STRUCT(r);
 	r.in.handle = handle;
 	r.out.num_subkeys = &num_subkeys;
@@ -422,30 +330,24 @@ static bool test_QueryInfoKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.out.secdescsize = &secdescsize;
 	r.out.last_changed_time = &last_changed_time;
 
-	r.out.classname = talloc(mem_ctx, struct winreg_String);
+	r.out.classname = talloc(tctx, struct winreg_String);
 	
-	r.in.classname = talloc(mem_ctx, struct winreg_String);
+	r.in.classname = talloc(tctx, struct winreg_String);
 	init_winreg_String(r.in.classname, class);
 	
-	status = dcerpc_winreg_QueryInfoKey(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("QueryInfoKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, 
+		dcerpc_winreg_QueryInfoKey(p, tctx, &r),
+		"QueryInfoKey failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("QueryInfoKey failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "QueryInfoKey failed");
 
 	return true;
 }
 
-static bool test_key(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_key(struct dcerpc_pipe *p, struct torture_context *tctx,
 		     struct policy_handle *handle, int depth);
 
-static bool test_EnumKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_EnumKey(struct dcerpc_pipe *p, struct torture_context *tctx,
 			 struct policy_handle *handle, int depth)
 {
 	struct winreg_EnumKey r;
@@ -453,8 +355,6 @@ static bool test_EnumKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	NTTIME t = 0;
 
-	printf("Testing EnumKey\n\n");
-
 	class.name   = "";
 	class.size   = 1024;
 
@@ -469,18 +369,19 @@ static bool test_EnumKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		name.name   = NULL;
 		name.size   = 1024;
 
-		status = dcerpc_winreg_EnumKey(p, mem_ctx, &r);
+		status = dcerpc_winreg_EnumKey(p, tctx, &r);
 
 		if (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(r.out.result)) {
 			struct policy_handle key_handle;
 
-			printf("EnumKey: %d: %s\n", r.in.enum_index, r.out.name->name);
+			torture_comment(tctx, "EnumKey: %d: %s\n", r.in.enum_index, 
+							r.out.name->name);
 
 			if (!test_OpenKey(
-				    p, mem_ctx, handle, r.out.name->name,
+				    p, tctx, handle, r.out.name->name,
 				    &key_handle)) {
 			} else {
-				test_key(p, mem_ctx, &key_handle, depth + 1);
+				test_key(p, tctx, &key_handle, depth + 1);
 			}
 		}
 
@@ -488,64 +389,59 @@ static bool test_EnumKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	} while (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(r.out.result));
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("EnumKey failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, status, "EnumKey failed");
 
-	if (!W_ERROR_IS_OK(r.out.result) && !W_ERROR_EQUAL(r.out.result, WERR_NO_MORE_ITEMS)) {
-		printf("EnumKey failed - %s\n", win_errstr(r.out.result));
-		return false;
+	if (!W_ERROR_IS_OK(r.out.result) && 
+		!W_ERROR_EQUAL(r.out.result, WERR_NO_MORE_ITEMS)) {
+		torture_fail(tctx, "EnumKey failed");
 	}
 
-
-
 	return true;
 }
 
-static bool test_QueryMultipleValues(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *valuename)
+static bool test_QueryMultipleValues(struct dcerpc_pipe *p, 
+									 struct torture_context *tctx, 
+									 struct policy_handle *handle, 
+									 const char *valuename)
 {
 	struct winreg_QueryMultipleValues r;
 	NTSTATUS status;
 	uint32_t bufsize=0;
 
-	printf("Testing QueryMultipleValues\n");
-
 	r.in.key_handle = handle;
-	r.in.values = r.out.values = talloc_array(mem_ctx, struct QueryMultipleValue, 1);
-	r.in.values[0].name = talloc(mem_ctx, struct winreg_String);
+	r.in.values = r.out.values = talloc_array(tctx, struct QueryMultipleValue, 1);
+	r.in.values[0].name = talloc(tctx, struct winreg_String);
 	r.in.values[0].name->name = valuename;
 	r.in.values[0].offset = 0;
 	r.in.values[0].length = 0;
 	r.in.values[0].type = 0;
 
 	r.in.num_values = 1;
-	r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32_t);
+	r.in.buffer_size = r.out.buffer_size = talloc(tctx, uint32_t);
 	*r.in.buffer_size = bufsize;
 	do { 
 		*r.in.buffer_size = bufsize;
-		r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8_t, 
+		r.in.buffer = r.out.buffer = talloc_zero_array(tctx, uint8_t, 
 							       *r.in.buffer_size);
 
-		status = dcerpc_winreg_QueryMultipleValues(p, mem_ctx, &r);
+		status = dcerpc_winreg_QueryMultipleValues(p, tctx, &r);
 	
-		if(NT_STATUS_IS_ERR(status)) {
-			printf("QueryMultipleValues failed - %s\n", nt_errstr(status));
-			return false;
-		}
+		if(NT_STATUS_IS_ERR(status))
+			torture_fail(tctx, "QueryMultipleValues failed");
+
 		talloc_free(r.in.buffer);
 		bufsize += 0x20;
 	} while (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA));
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("QueryMultipleValues failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "QueryMultipleValues failed");
 
 	return true;
 }
 
-static bool test_QueryValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *valuename)
+static bool test_QueryValue(struct dcerpc_pipe *p, 
+							struct torture_context *tctx, 
+							struct policy_handle *handle, 
+							const char *valuename)
 {
 	struct winreg_QueryValue r;
 	NTSTATUS status;
@@ -553,8 +449,6 @@ static bool test_QueryValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct p
 	uint32_t offered = 0xfff;
 	uint32_t zero = 0;
 
-	printf("Testing QueryValue\n");
-
 	r.in.handle = handle;
 	r.in.data = NULL;
 	r.in.value_name.name = valuename;
@@ -562,21 +456,17 @@ static bool test_QueryValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct p
 	r.in.size = &offered;
 	r.in.length = &zero;
 
-	status = dcerpc_winreg_QueryValue(p, mem_ctx, &r);
-	if(NT_STATUS_IS_ERR(status)) {
-		printf("QueryValue failed - %s\n", nt_errstr(status));
-		return false;
+	status = dcerpc_winreg_QueryValue(p, tctx, &r);
+	if (NT_STATUS_IS_ERR(status)) {
+		torture_fail(tctx, "QueryValue failed");
 	}
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("QueryValue failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "QueryValue failed");
 
 	return true;
 }
 
-static bool test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_EnumValue(struct dcerpc_pipe *p, struct torture_context *tctx,
 			   struct policy_handle *handle, int max_valnamelen, int max_valbufsize)
 {
 	struct winreg_EnumValue r;
@@ -586,8 +476,6 @@ static bool test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	uint8_t buf8;
 	struct winreg_StringBuf name;
 
-	printf("testing EnumValue\n");
-
 	name.name   = "";
 	name.size   = 1024;
 
@@ -601,237 +489,219 @@ static bool test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.size = &size;
 	
 	do {
-		NTSTATUS status = dcerpc_winreg_EnumValue(p, mem_ctx, &r);
-		if(NT_STATUS_IS_ERR(status)) {
-			printf("EnumValue failed - %s\n", nt_errstr(status));
-			return false;
-		}
+		torture_assert_ntstatus_ok(tctx, dcerpc_winreg_EnumValue(p, tctx, &r),
+								   "EnumValue failed");
 
 		if (W_ERROR_IS_OK(r.out.result)) {
-			ret &= test_QueryValue(p, mem_ctx, handle, r.out.name->name);
-			ret &= test_QueryMultipleValues(p, mem_ctx, handle, r.out.name->name);
+			ret &= test_QueryValue(p, tctx, handle, r.out.name->name);
+			ret &= test_QueryMultipleValues(p, tctx, handle, r.out.name->name);
 		}
 
 		r.in.enum_index++;
 	} while (W_ERROR_IS_OK(r.out.result));
 
-	if(!W_ERROR_EQUAL(r.out.result, WERR_NO_MORE_ITEMS)) {
-		printf("EnumValue failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_equal(tctx, r.out.result, WERR_NO_MORE_ITEMS,
+		"EnumValue failed");
 
 	return ret;
 }
 
-static bool test_InitiateSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			const char *msg, uint32_t timeout)
+static bool test_AbortSystemShutdown(struct dcerpc_pipe *p, 
+									 struct torture_context *tctx)
 {
-	struct winreg_InitiateSystemShutdown r;
-	NTSTATUS status;
-	uint16_t hostname = 0x0;
-	
-	r.in.hostname = &hostname;
-	r.in.message = talloc(mem_ctx, struct initshutdown_String);
-	init_initshutdown_String(mem_ctx, r.in.message, msg);
-	r.in.force_apps = 1;
-	r.in.timeout = timeout;
-	r.in.reboot = 1;
+	struct winreg_AbortSystemShutdown r;
+	uint16_t server = 0x0;
 
-	status = dcerpc_winreg_InitiateSystemShutdown(p, mem_ctx, &r);
+	r.in.server = &server;
+	
+	torture_assert_ntstatus_ok(tctx, 
+							   dcerpc_winreg_AbortSystemShutdown(p, tctx, &r),
+							   "AbortSystemShutdown failed");
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("InitiateSystemShutdown failed - %s\n", nt_errstr(status));
-		return false;
-	}
-
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("InitiateSystemShutdown failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "AbortSystemShutdown failed");
 
 	return true;
 }
 
-static bool test_InitiateSystemShutdownEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			const char *msg, uint32_t timeout)
+static bool test_InitiateSystemShutdown(struct torture_context *tctx,
+										struct dcerpc_pipe *p)
 {
-	struct winreg_InitiateSystemShutdownEx r;
-	NTSTATUS status;
+	struct winreg_InitiateSystemShutdown r;
 	uint16_t hostname = 0x0;
-	
+
+	if (!torture_setting_bool(tctx, "dangerous", false))
+		torture_skip(tctx, 
+		   "winreg_InitiateShutdown disabled - enable dangerous tests to use");
+
+
 	r.in.hostname = &hostname;
-	r.in.message = talloc(mem_ctx, struct initshutdown_String);
-	init_initshutdown_String(mem_ctx, r.in.message, msg);
+	r.in.message = talloc(tctx, struct initshutdown_String);
+	init_initshutdown_String(tctx, r.in.message, "spottyfood");
 	r.in.force_apps = 1;
-	r.in.timeout = timeout;
+	r.in.timeout = 30;
 	r.in.reboot = 1;
-	r.in.reason = 0;
-
-	status = dcerpc_winreg_InitiateSystemShutdownEx(p, mem_ctx, &r);
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("InitiateSystemShutdownEx failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, 
+							dcerpc_winreg_InitiateSystemShutdown(p, tctx, &r),
+							"InitiateSystemShutdown failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("InitiateSystemShutdownEx failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, "InitiateSystemShutdown failed");
 
-	return true;
+	return test_AbortSystemShutdown(p, tctx);
 }
 
-static bool test_AbortSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+
+static bool test_InitiateSystemShutdownEx(struct torture_context *tctx,
+										  struct dcerpc_pipe *p)
 {
-	struct winreg_AbortSystemShutdown r;
-	NTSTATUS status;
-	uint16_t server = 0x0;
+	struct winreg_InitiateSystemShutdownEx r;
+	uint16_t hostname = 0x0;
 
-	r.in.server = &server;
+	if (!torture_setting_bool(tctx, "dangerous", false))
+		torture_skip(tctx, 
+		   "winreg_InitiateShutdownEx disabled - enable dangerous tests to use");
 	
-	status = dcerpc_winreg_AbortSystemShutdown(p, mem_ctx, &r);
+	r.in.hostname = &hostname;
+	r.in.message = talloc(tctx, struct initshutdown_String);
+	init_initshutdown_String(tctx, r.in.message, "spottyfood");
+	r.in.force_apps = 1;
+	r.in.timeout = 30;
+	r.in.reboot = 1;
+	r.in.reason = 0;
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("AbortSystemShutdown failed - %s\n", nt_errstr(status));
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, 
+		dcerpc_winreg_InitiateSystemShutdownEx(p, tctx, &r),
+		"InitiateSystemShutdownEx failed");
 
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		printf("AbortSystemShutdown failed - %s\n", win_errstr(r.out.result));
-		return false;
-	}
+	torture_assert_werr_ok(tctx, r.out.result, 
+						   "InitiateSystemShutdownEx failed");
 
-	return true;
+	return test_AbortSystemShutdown(p, tctx);
 }
-
 #define MAX_DEPTH 2		/* Only go this far down the tree */
 
-static bool test_key(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_key(struct dcerpc_pipe *p, struct torture_context *tctx, 
 		     struct policy_handle *handle, int depth)
 {
 	if (depth == MAX_DEPTH)
 		return true;
 
-	if (!test_QueryInfoKey(p, mem_ctx, handle, NULL)) {
+	if (!test_QueryInfoKey(p, tctx, handle, NULL)) {
 	}
 
-	if (!test_NotifyChangeKeyValue(p, mem_ctx, handle)) {
+	if (!test_NotifyChangeKeyValue(p, tctx, handle)) {
 	}
 	
-	if (!test_GetKeySecurity(p, mem_ctx, handle)) {
+	if (!test_GetKeySecurity(p, tctx, handle)) {
 	}
 
-	if (!test_EnumKey(p, mem_ctx, handle, depth)) {
+	if (!test_EnumKey(p, tctx, handle, depth)) {
 	}
 
-	if (!test_EnumValue(p, mem_ctx, handle, 0xFF, 0xFFFF)) {
+	if (!test_EnumValue(p, tctx, handle, 0xFF, 0xFFFF)) {
 	}
 
-	test_CloseKey(p, mem_ctx, handle);
+	test_CloseKey(p, tctx, handle);
 
 	return true;
 }
 
 typedef NTSTATUS (*winreg_open_fn)(struct dcerpc_pipe *, TALLOC_CTX *, void *);
 
-static bool test_Open(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-		      const char *name, winreg_open_fn open_fn)
+static bool test_Open(struct torture_context *tctx, struct dcerpc_pipe *p, 
+		      void *userdata)
 {
 	struct policy_handle handle, newhandle;
 	bool ret = true, created = false, created2 = false, deleted = false;
 	bool created3 = false, created_subkey = false;
 	struct winreg_OpenHKLM r;
-	NTSTATUS status;
 
-	printf("Testing %s\n", name);
+	winreg_open_fn open_fn = userdata;
 
 	r.in.system_name = 0;
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = &handle;
 	
-	status = open_fn(p, mem_ctx, &r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return false;
-	}
+	torture_assert_ntstatus_ok(tctx, open_fn(p, tctx, &r), 
+							   "open");
 
-	test_Cleanup(p, mem_ctx, &handle, TEST_KEY1);
-	test_Cleanup(p, mem_ctx, &handle, TEST_KEY2);
-	test_Cleanup(p, mem_ctx, &handle, TEST_SUBKEY);
-	test_Cleanup(p, mem_ctx, &handle, TEST_KEY3);
-	test_Cleanup(p, mem_ctx, &handle, TEST_KEY_BASE);
+	test_Cleanup(p, tctx, &handle, TEST_KEY1);
+	test_Cleanup(p, tctx, &handle, TEST_KEY2);
+	test_Cleanup(p, tctx, &handle, TEST_SUBKEY);
+	test_Cleanup(p, tctx, &handle, TEST_KEY3);
+	test_Cleanup(p, tctx, &handle, TEST_KEY_BASE);
 
-	if (!test_CreateKey(p, mem_ctx, &handle, TEST_KEY1, NULL)) {
-		printf("CreateKey failed - not considering a failure\n");
+	if (!test_CreateKey(p, tctx, &handle, TEST_KEY1, NULL)) {
+		torture_comment(tctx, "CreateKey failed - not considering a failure\n");
 	} else {
 		created = true;
 	}
 
-	if (created && !test_FlushKey(p, mem_ctx, &handle)) {
-		printf("FlushKey failed\n");
+	if (created && !test_FlushKey(p, tctx, &handle)) {
+		torture_comment(tctx, "FlushKey failed\n");
 		ret = false;
 	}
 
-	if (created && !test_OpenKey(p, mem_ctx, &handle, TEST_KEY1, &newhandle)) {
-		printf("CreateKey failed (OpenKey after Create didn't work)\n");
-		ret = false;
-	}
+	if (created && !test_OpenKey(p, tctx, &handle, TEST_KEY1, &newhandle))
+		torture_fail(tctx, 
+					 "CreateKey failed (OpenKey after Create didn't work)\n");
 
-	if (created && !test_DeleteKey(p, mem_ctx, &handle, TEST_KEY1)) {
-		printf("DeleteKey failed\n");
+	if (created && !test_DeleteKey(p, tctx, &handle, TEST_KEY1)) {
+		torture_comment(tctx, "DeleteKey failed\n");
 		ret = false;
 	} else {
 		deleted = true;
 	}
 
-	if (created && !test_FlushKey(p, mem_ctx, &handle)) {
-		printf("FlushKey failed\n");
+	if (created && !test_FlushKey(p, tctx, &handle)) {
+		torture_comment(tctx, "FlushKey failed\n");
 		ret = false;
 	}
 
 	if (created && deleted && 
-	    test_OpenKey(p, mem_ctx, &handle, TEST_KEY1, &newhandle)) {
-		printf("DeleteKey failed (OpenKey after Delete worked)\n");
+	    test_OpenKey(p, tctx, &handle, TEST_KEY1, &newhandle)) {
+		torture_comment(tctx, 
+						"DeleteKey failed (OpenKey after Delete worked)\n");
 		ret = false;
 	}
 
-	if (!test_GetVersion(p, mem_ctx, &handle)) {
-		printf("GetVersion failed\n");
+	if (!test_GetVersion(p, tctx, &handle)) {
+		torture_comment(tctx, "GetVersion failed\n");
 		ret = false;
 	}
 
-	if (created && test_CreateKey_sd(p, mem_ctx, &handle, TEST_KEY2, 
+	if (created && test_CreateKey_sd(p, tctx, &handle, TEST_KEY2, 
 					  NULL, &newhandle)) {
 		created2 = true;
 	}
 
-	if (created2 && !test_GetKeySecurity(p, mem_ctx, &newhandle)) {
+	if (created2 && !test_GetKeySecurity(p, tctx, &newhandle)) {
 		printf("GetKeySecurity failed\n");
 		ret = false;
 	}
 
-	if (created2 && !test_CloseKey(p, mem_ctx, &newhandle)) {
+	if (created2 && !test_CloseKey(p, tctx, &newhandle)) {
 		printf("CloseKey failed\n");
 		ret = false;
 	}
 
-	if (created && !test_DeleteKey(p, mem_ctx, &handle, TEST_KEY2)) {
+	if (created && !test_DeleteKey(p, tctx, &handle, TEST_KEY2)) {
 		printf("DeleteKey failed\n");
 		ret = false;
 	}
 
-	if (created && test_CreateKey(p, mem_ctx, &handle, TEST_KEY3, NULL)) {
+	if (created && test_CreateKey(p, tctx, &handle, TEST_KEY3, NULL)) {
 		created3 = true;
 	}
 
 	if (created3 && 
-	    test_CreateKey(p, mem_ctx, &handle, TEST_SUBKEY, NULL)) 
+	    test_CreateKey(p, tctx, &handle, TEST_SUBKEY, NULL)) 
 	{
 		created_subkey = true;
 	}
 
 	if (created_subkey && 
-	    !test_DeleteKeyWithSubkey(p, mem_ctx, &handle, TEST_KEY3)) 
+	    !test_DeleteKeyWithSubkey(p, tctx, &handle, TEST_KEY3)) 
 	{
 		printf("DeleteKeyWithSubkey failed "
 		       "(DeleteKey didn't return ACCESS_DENIED)\n");
@@ -839,42 +709,37 @@ static bool test_Open(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	}
 
 	if (created_subkey && 
-	    !test_DeleteKey(p, mem_ctx, &handle, TEST_SUBKEY))
+	    !test_DeleteKey(p, tctx, &handle, TEST_SUBKEY))
 	{
 		printf("DeleteKey failed\n");
 		ret = false;
 	}
 
 	if (created3 &&
-	    !test_DeleteKey(p, mem_ctx, &handle, TEST_KEY3))
+	    !test_DeleteKey(p, tctx, &handle, TEST_KEY3))
 	{
 		printf("DeleteKey failed\n");
 		ret = false;
 	}
 
 	/* The HKCR hive has a very large fanout */
-
 	if (open_fn == (void *)dcerpc_winreg_OpenHKCR) {
-		if(!test_key(p, mem_ctx, &handle, MAX_DEPTH - 1)) {
+		if(!test_key(p, tctx, &handle, MAX_DEPTH - 1)) {
 			ret = false;
 		}
 	}
 
-	if(!test_key(p, mem_ctx, &handle, 0)) {
+	if(!test_key(p, tctx, &handle, 0)) {
 		ret = false;
 	}
 
-	test_Cleanup(p, mem_ctx, &handle, TEST_KEY_BASE);
+	test_Cleanup(p, tctx, &handle, TEST_KEY_BASE);
 
 	return ret;
 }
 
-bool torture_rpc_winreg(struct torture_context *torture)
+struct torture_suite *torture_rpc_winreg(TALLOC_CTX *mem_ctx)
 {
-        NTSTATUS status;
-	struct dcerpc_pipe *p;
-	TALLOC_CTX *mem_ctx;
-	bool ret = true;
 	struct {
 		const char *name;
 		winreg_open_fn fn;
@@ -883,29 +748,22 @@ bool torture_rpc_winreg(struct torture_context *torture)
 			{"OpenHKCR", (winreg_open_fn)dcerpc_winreg_OpenHKCR },
 			{"OpenHKCU", (winreg_open_fn)dcerpc_winreg_OpenHKCU }};
 	int i;
-	mem_ctx = talloc_init("torture_rpc_winreg");
+	struct torture_tcase *tcase;
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "WINREG");
 
-	status = torture_rpc_connection(mem_ctx, &p, &ndr_table_winreg);
+	tcase = torture_suite_add_rpc_iface_tcase(suite, "winreg", 
+											  &ndr_table_winreg);
 
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		return false;
-	}
+	torture_rpc_tcase_add_test(tcase, "InitiateSystemShutdown", 
+							   test_InitiateSystemShutdown);
 
-	if (!torture_setting_bool(torture, "dangerous", false)) {
-		printf("winreg_InitiateShutdown disabled - enable dangerous tests to use\n");
-	} else {
-		ret &= test_InitiateSystemShutdown(p, mem_ctx, "spottyfood", 30);
-		ret &= test_AbortSystemShutdown(p, mem_ctx);
-		ret &= test_InitiateSystemShutdownEx(p, mem_ctx, "spottyfood", 30);
-		ret &= test_AbortSystemShutdown(p, mem_ctx);
-	}
+	torture_rpc_tcase_add_test(tcase, "InitiateSystemShutdownEx", 
+							   test_InitiateSystemShutdownEx);
 
 	for (i = 0; i < ARRAY_SIZE(open_fns); i++) {
-		ret &= test_Open(p, mem_ctx, open_fns[i].name, open_fns[i].fn);
+		torture_rpc_tcase_add_test_ex(tcase, open_fns[i].name, test_Open, 
+									  open_fns[i].fn);
 	}
 
-	talloc_free(mem_ctx);
-
-	return ret;
+	return suite;
 }
diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index 003582179e..683b0f114b 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -433,3 +433,37 @@ struct torture_suite *torture_find_suite(struct torture_suite *parent,
 
 	return NULL;
 }
+
+static bool wrap_test_with_simple_test(struct torture_context *torture_ctx,
+									struct torture_tcase *tcase,
+									struct torture_test *test)
+{
+	bool (*fn) (struct torture_context *, const void *tcase_data);
+
+	fn = test->fn;
+
+	return fn(torture_ctx, tcase->data);
+}
+
+struct torture_test *torture_tcase_add_simple_test(
+		struct torture_tcase *tcase,
+		const char *name,
+		bool (*run) (struct torture_context *test, const void *tcase_data))
+{
+	struct torture_test *test; 
+	
+	test = talloc(tcase, struct torture_test);
+
+	test->name = talloc_strdup(test, name);
+	test->description = NULL;
+	test->run = wrap_test_with_simple_test;
+	test->fn = run;
+	test->data = NULL;
+	test->dangerous = False;
+
+	DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+
+	return test;
+}
+
+
diff --git a/source4/torture/ui.h b/source4/torture/ui.h
index 4dd5e45300..c3b0092d48 100644
--- a/source4/torture/ui.h
+++ b/source4/torture/ui.h
@@ -165,6 +165,13 @@ struct torture_tcase *torture_suite_add_simple_tcase(
 		bool (*run) (struct torture_context *test, const void *test_data),
 		const void *data);
 
+/* Convenience function that adds a test which only 
+ * gets the test case data */
+struct torture_test *torture_tcase_add_simple_test(
+		struct torture_tcase *tcase,
+		const char *name,
+		bool (*run) (struct torture_context *test, const void *tcase_data));
+
 /* Convenience wrapper that adds a test that doesn't need any 
  * testcase data */
 struct torture_tcase *torture_suite_add_simple_test(
@@ -258,6 +265,20 @@ void torture_result(struct torture_context *test,
 	talloc_free(__got); \
 	} while(0)
 
+#define torture_assert_file_contains(torture_ctx,filename,expected,cmt)\
+	do { const char *__got, *__expected = (expected); \
+	size_t __size; \
+	__got = file_load(filename, *size, torture_ctx); \
+	if (strcmp_safe(__got, __expected) != 0) { \
+		torture_result(torture_ctx, TORTURE_FAIL, \
+					   __location__": %s contained:\n%sExpected: %s%s\n", \
+					   __got, __expected, cmt); \
+		talloc_free(__got); \
+		return false; \
+	} \
+	talloc_free(__got); \
+	} while(0)
+
 #define torture_assert_int_equal(torture_ctx,got,expected,cmt)\
 	do { int __got = (got), __expected = (expected); \
 	if (__got != __expected) { \