X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=source4%2Ftorture%2Frpc%2Fsrvsvc.c;h=4a60e600d643a0d5283d728b0b69cb68375dbac4;hp=274f266ea0973a9c32b0c164bed2cbb5e76e25dd;hb=c125a7c5a7aee1b0506ab4eddbb4868ca8411fba;hpb=fcaeedeff3c7d65f65da19440eb7b1ac01481167

diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 274f266ea09..4a60e600d64 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -6,7 +6,7 @@
    
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -28,83 +27,64 @@
 /**************************/
 /* srvsvc_NetCharDev      */
 /**************************/
-static BOOL test_NetCharDevGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_NetCharDevGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx,
 				const char *devname)
 {
 	NTSTATUS status;
 	struct srvsvc_NetCharDevGetInfo r;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.device_name = devname;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetCharDevGetInfo level %u on device '%s'\n",
+		torture_comment(tctx, "testing NetCharDevGetInfo level %u on device '%s'\n",
 			r.in.level, r.in.device_name);
-		status = dcerpc_srvsvc_NetCharDevGetInfo(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetCharDevGetInfo level %u on device '%s' failed - %s\n",
-				r.in.level, r.in.device_name, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetCharDevGetInfo level %u on device '%s' failed - %s\n",
-				r.in.level, r.in.device_name, win_errstr(r.out.result));
-			continue;
-		}
+		status = dcerpc_srvsvc_NetCharDevGetInfo(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetCharDevGetInfo failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetCharDevGetInfo failed");
 	}
 
-	return ret;
+	return true;
 }
 
-static BOOL test_NetCharDevControl(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_NetCharDevControl(struct dcerpc_pipe *p, struct torture_context *tctx,
 				const char *devname)
 {
 	NTSTATUS status;
 	struct srvsvc_NetCharDevControl r;
 	uint32_t opcodes[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.device_name = devname;
 
 	for (i=0;i<ARRAY_SIZE(opcodes);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.opcode = opcodes[i];
-		d_printf("testing NetCharDevControl opcode %u on device '%s'\n", 
+		torture_comment(tctx, "testing NetCharDevControl opcode %u on device '%s'\n", 
 			r.in.opcode, r.in.device_name);
-		status = dcerpc_srvsvc_NetCharDevControl(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetCharDevControl opcode %u failed - %s\n", r.in.opcode, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetCharDevControl opcode %u failed - %s\n", r.in.opcode, win_errstr(r.out.result));
-			continue;
-		}
+		status = dcerpc_srvsvc_NetCharDevControl(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetCharDevControl failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetCharDevControl failed");
 	}
 
-	return ret;
+	return true;
 }
 
-static BOOL test_NetCharDevEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetCharDevEnum(struct torture_context *tctx, 
+								struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetCharDevEnum r;
 	struct srvsvc_NetCharDevCtr0 c0;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
@@ -114,79 +94,61 @@ static BOOL test_NetCharDevEnum(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		int j;
 
-
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		printf("testing NetCharDevEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetCharDevEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetCharDevEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetCharDevEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetCharDevEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetCharDevEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetCharDevEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetCharDevEnum failed");
 
 		/* call test_NetCharDevGetInfo and test_NetCharDevControl for each returned share */
 		if (r.in.level == 1) {
 			for (j=0;j<r.out.ctr.ctr1->count;j++) {
 				const char *device;
 				device = r.out.ctr.ctr1->array[j].device;
-				if (!test_NetCharDevGetInfo(p, mem_ctx, device)) {
-					ret = False;
+				if (!test_NetCharDevGetInfo(p, tctx, device)) {
+					return false;
 				}
-				if (!test_NetCharDevControl(p, mem_ctx, device)) {
-					ret = False;
+				if (!test_NetCharDevControl(p, tctx, device)) {
+					return false;
 				}
 			}
 		}
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetCharDevQ     */
 /**************************/
-static BOOL test_NetCharDevQGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_NetCharDevQGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx,
 				const char *devicequeue)
 {
 	NTSTATUS status;
 	struct srvsvc_NetCharDevQGetInfo r;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.queue_name = devicequeue;
-	r.in.user = talloc_asprintf(mem_ctx,"Administrator");
+	r.in.user = talloc_asprintf(tctx,"Administrator");
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetCharDevQGetInfo level %u on devicequeue '%s'\n",
+		torture_comment(tctx, "testing NetCharDevQGetInfo level %u on devicequeue '%s'\n",
 			r.in.level, r.in.queue_name);
-		status = dcerpc_srvsvc_NetCharDevQGetInfo(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetCharDevQGetInfo level %u on devicequeue '%s' failed - %s\n",
-				r.in.level, r.in.queue_name, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			printf("NetCharDevQGetInfo level %u on devicequeue '%s' failed - %s\n",
-				r.in.level, r.in.queue_name, win_errstr(r.out.result));
-			continue;
-		}
+		status = dcerpc_srvsvc_NetCharDevQGetInfo(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetCharDevQGetInfo failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetCharDevQGetInfo failed");
 	}
 
-	return ret;
+	return true;
 }
 
 #if 0
-static BOOL test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 				const char *devicequeue)
 {
 	NTSTATUS status;
@@ -194,7 +156,7 @@ static BOOL test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	uint32_t parm_error;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
+	bool ret = true;
 
 	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.queue_name = devicequeue;
@@ -226,7 +188,7 @@ static BOOL test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		if (!NT_STATUS_IS_OK(status)) {
 			d_printf("NetCharDevQSetInfo level %u on devicequeue '%s' failed - %s\n",
 				r.in.level, r.in.queue_name, nt_errstr(status));
-			ret = False;
+			ret = false;
 			continue;
 		}
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -240,18 +202,17 @@ static BOOL test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 #endif
 
-static BOOL test_NetCharDevQEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetCharDevQEnum(struct torture_context *tctx, 
+				 struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetCharDevQEnum r;
 	struct srvsvc_NetCharDevQCtr0 c0;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
-	r.in.user = talloc_asprintf(mem_ctx,"%s","Administrator");
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.user = talloc_asprintf(tctx,"%s","Administrator");
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
@@ -263,48 +224,40 @@ static BOOL test_NetCharDevQEnum(struct dcerpc_pipe *p,
 
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		printf("testing NetCharDevQEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetCharDevQEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetCharDevQEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetCharDevQEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetCharDevQEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetCharDevQEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetCharDevQEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetCharDevQEnum failed");
 
 		/* call test_NetCharDevGetInfo and test_NetCharDevControl for each returned share */
 		if (r.in.level == 1) {
 			for (j=0;j<r.out.ctr.ctr1->count;j++) {
 				const char *device;
 				device = r.out.ctr.ctr1->array[j].device;
-				if (!test_NetCharDevQGetInfo(p, mem_ctx, device)) {
-					ret = False;
+				if (!test_NetCharDevQGetInfo(p, tctx, device)) {
+					return false;
 				}
 			}
 		}
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetConn         */
 /**************************/
-static BOOL test_NetConnEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetConnEnum(struct torture_context *tctx,
+			     struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetConnEnum r;
 	struct srvsvc_NetConnCtr0 c0;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
-	r.in.path = talloc_asprintf(mem_ctx,"%s","ADMIN$");
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.path = talloc_asprintf(tctx,"%s","ADMIN$");
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
@@ -314,36 +267,28 @@ static BOOL test_NetConnEnum(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetConnEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetConnEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetConnEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetConnEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetConnEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetConnEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetConnEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetConnEnum failed");
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetFile         */
 /**************************/
-static BOOL test_NetFileEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetFileEnum(struct torture_context *tctx,
+			     struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetFileEnum r;
 	struct srvsvc_NetFileCtr3 c3;
 	uint32_t levels[] = {2, 3};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.path = NULL;
 	r.in.user = NULL;
 	r.in.ctr.ctr3 = &c3;
@@ -355,36 +300,28 @@ static BOOL test_NetFileEnum(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetFileEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetFileEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetFileEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetFileEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetFileEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetFileEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetFileEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetFileEnum failed");
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetSess         */
 /**************************/
-static BOOL test_NetSessEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetSessEnum(struct torture_context *tctx,
+			     struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetSessEnum r;
 	struct srvsvc_NetSessCtr0 c0;
 	uint32_t levels[] = {0, 1, 2, 10, 502};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.client = NULL;
 	r.in.user = NULL;
 	r.in.ctr.ctr0 = &c0;
@@ -396,53 +333,40 @@ static BOOL test_NetSessEnum(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetSessEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetSessEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetSessEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetSessEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetSessEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetSessEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetSessEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetSessEnum failed");
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetShare        */
 /**************************/
-static BOOL test_NetShareCheck(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_NetShareCheck(struct dcerpc_pipe *p, struct torture_context *tctx,
 			       const char *device_name)
 {
 	NTSTATUS status;
 	struct srvsvc_NetShareCheck r;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.device_name = device_name;
 
-	d_printf("testing NetShareCheck on device '%s'\n", r.in.device_name);
-
-	status = dcerpc_srvsvc_NetShareCheck(p, mem_ctx, &r);
-	if (!NT_STATUS_IS_OK(status)) {
-		d_printf("dcerpc_srvsvc_NetShareCheck on device '%s' failed - %s\n",
-			r.in.device_name, nt_errstr(status));
-		ret = False;
-	} else if (!W_ERROR_IS_OK(r.out.result)) {
-		d_printf("NetShareCheck on device '%s' failed - %s\n",
-			r.in.device_name, win_errstr(r.out.result));
-		ret = False;
-	}
+	torture_comment(tctx, 
+			"testing NetShareCheck on device '%s'\n", r.in.device_name);
 
-	return ret;
+	status = dcerpc_srvsvc_NetShareCheck(p, tctx, &r);
+	torture_assert_ntstatus_ok(tctx, status, "dcerpc_srvsvc_NetShareCheck failed");
+	torture_assert_werr_ok(tctx, r.out.result, "NetShareCheck failed");
+
+	return true;
 }
 
-static BOOL test_NetShareGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-				 const char *sharename, BOOL admin)
+static bool test_NetShareGetInfo(struct torture_context *tctx, 
+				 struct dcerpc_pipe *p,
+				 const char *sharename, bool admin)
 {
 	NTSTATUS status;
 	struct srvsvc_NetShareGetInfo r;
@@ -459,9 +383,8 @@ static BOOL test_NetShareGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		 { 1005,	WERR_OK,		WERR_OK },
 	};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.share_name = sharename;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -472,35 +395,37 @@ static BOOL test_NetShareGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		if (admin) expected = levels[i].admin_status;
 		ZERO_STRUCT(r.out);
 
-		d_printf("testing NetShareGetInfo level %u on share '%s'\n", 
+		torture_comment(tctx, "testing NetShareGetInfo level %u on share '%s'\n", 
 		       r.in.level, r.in.share_name);
 
-		status = dcerpc_srvsvc_NetShareGetInfo(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetShareGetInfo level %u on share '%s' failed - %s\n",
-				r.in.level, r.in.share_name, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_EQUAL(r.out.result, expected)) {
-			d_printf("NetShareGetInfo level %u on share '%s' failed - %s (expected %s)\n",
-				r.in.level, r.in.share_name, win_errstr(r.out.result),
-				win_errstr(expected));
-			ret = False;
-			continue;
-		}
+		status = dcerpc_srvsvc_NetShareGetInfo(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetShareGetInfo failed");
+		torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareGetInfo failed");
 
 		if (r.in.level != 2) continue;
 		if (!r.out.info.info2 || !r.out.info.info2->path) continue;
-		if (!test_NetShareCheck(p, mem_ctx, r.out.info.info2->path)) {
-			ret = False;
+		if (!test_NetShareCheck(p, tctx, r.out.info.info2->path)) {
+			return false;
 		}
 	}
 
-	return ret;
+	return true;
 }
 
-static BOOL test_NetShareAddSetDel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool test_NetShareGetInfoAdminFull(struct torture_context *tctx, 
+					  struct dcerpc_pipe *p)
+{
+	return test_NetShareGetInfo(tctx, p, "ADMIN$", true);
+}
+
+static bool test_NetShareGetInfoAdminAnon(struct torture_context *tctx, 
+					  struct dcerpc_pipe *p)
+{
+	return test_NetShareGetInfo(tctx, p, "ADMIN$", false);
+}
+
+static bool test_NetShareAddSetDel(struct torture_context *tctx, 
+				   struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetShareAdd a;
@@ -523,35 +448,27 @@ static BOOL test_NetShareAddSetDel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 		 { 1501,	WERR_OK },
 	};
 	int i;
-	BOOL ret = True;
 
 	a.in.server_unc = r.in.server_unc = q.in.server_unc = d.in.server_unc =
-		talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-	r.in.share_name = talloc_strdup(mem_ctx, "testshare");
+		talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+	r.in.share_name = talloc_strdup(tctx, "testshare");
 
 	a.in.level = 2;
-	a.in.info.info2 = talloc(mem_ctx, struct srvsvc_NetShareInfo2);
+	a.in.info.info2 = talloc(tctx, struct srvsvc_NetShareInfo2);
 	a.in.info.info2->name = r.in.share_name;
 	a.in.info.info2->type = STYPE_DISKTREE;
-	a.in.info.info2->comment = talloc_strdup(mem_ctx, "test comment");
+	a.in.info.info2->comment = talloc_strdup(tctx, "test comment");
 	a.in.info.info2->permissions = 123434566;
 	a.in.info.info2->max_users = -1;
 	a.in.info.info2->current_users = 0;
-	a.in.info.info2->path = talloc_strdup(mem_ctx, "C:\\");
+	a.in.info.info2->path = talloc_strdup(tctx, "C:\\");
 	a.in.info.info2->password = NULL;
 
 	a.in.parm_error = NULL;
 
-	status = dcerpc_srvsvc_NetShareAdd(p, mem_ctx, &a);
-	if (!NT_STATUS_IS_OK(status)) {
-		d_printf("NetShareAdd level 2 on share 'testshare' failed - %s\n",
-			 nt_errstr(status));
-		return False;
-	} else if (!W_ERROR_EQUAL(a.out.result, WERR_OK)) {
-		d_printf("NetShareAdd level 2 on share 'testshare' failed - %s\n",
-			 win_errstr(a.out.result));
-		return False;
-	}
+	status = dcerpc_srvsvc_NetShareAdd(p, tctx, &a);
+	torture_assert_ntstatus_ok(tctx, status, "NetShareAdd level 2 on share 'testshare' failed");
+	torture_assert_werr_ok(tctx, a.out.result, "NetShareAdd level 2 on share 'testshare' failed");
 
 	r.in.parm_error = NULL;
 
@@ -562,142 +479,114 @@ static BOOL test_NetShareAddSetDel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 		r.in.level = levels[i].level;
 		ZERO_STRUCT(r.out);
 
-		d_printf("testing NetShareSetInfo level %u on share '%s'\n", 
+		torture_comment(tctx, "testing NetShareSetInfo level %u on share '%s'\n", 
 		       r.in.level, r.in.share_name);
 
 		switch (levels[i].level) {
 		case 0:
-			r.in.info.info0 = talloc(mem_ctx, struct srvsvc_NetShareInfo0);
+			r.in.info.info0 = talloc(tctx, struct srvsvc_NetShareInfo0);
 			r.in.info.info0->name = r.in.share_name;
 			break;
 		case 1:
-			r.in.info.info1 = talloc(mem_ctx, struct srvsvc_NetShareInfo1);
+			r.in.info.info1 = talloc(tctx, struct srvsvc_NetShareInfo1);
 			r.in.info.info1->name = r.in.share_name;
 			r.in.info.info1->type = STYPE_DISKTREE;
-			r.in.info.info1->comment = talloc_strdup(mem_ctx, "test comment 1");
+			r.in.info.info1->comment = talloc_strdup(tctx, "test comment 1");
 			break;
 		case 2:	
-			r.in.info.info2 = talloc(mem_ctx, struct srvsvc_NetShareInfo2);
+			r.in.info.info2 = talloc(tctx, struct srvsvc_NetShareInfo2);
 			r.in.info.info2->name = r.in.share_name;
 			r.in.info.info2->type = STYPE_DISKTREE;
-			r.in.info.info2->comment = talloc_strdup(mem_ctx, "test comment 2");
+			r.in.info.info2->comment = talloc_strdup(tctx, "test comment 2");
 			r.in.info.info2->permissions = 0;
 			r.in.info.info2->max_users = 2;
 			r.in.info.info2->current_users = 1;
-			r.in.info.info2->path = talloc_strdup(mem_ctx, "::BLaH::"); /* "C:\\"); */
+			r.in.info.info2->path = talloc_strdup(tctx, "::BLaH::"); /* "C:\\"); */
 			r.in.info.info2->password = NULL;
 			break;
 		case 501:
-			r.in.info.info501 = talloc(mem_ctx, struct srvsvc_NetShareInfo501);
+			r.in.info.info501 = talloc(tctx, struct srvsvc_NetShareInfo501);
 			r.in.info.info501->name = r.in.share_name;
 			r.in.info.info501->type = STYPE_DISKTREE;
-			r.in.info.info501->comment = talloc_strdup(mem_ctx, "test comment 501");
+			r.in.info.info501->comment = talloc_strdup(tctx, "test comment 501");
 			r.in.info.info501->csc_policy = 0;
 			break;
 		case 502:
-			r.in.info.info502 = talloc(mem_ctx, struct srvsvc_NetShareInfo502);
+			r.in.info.info502 = talloc(tctx, struct srvsvc_NetShareInfo502);
 			r.in.info.info502->name = r.in.share_name;
 			r.in.info.info502->type = STYPE_DISKTREE;
-			r.in.info.info502->comment = talloc_strdup(mem_ctx, "test comment 502");
+			r.in.info.info502->comment = talloc_strdup(tctx, "test comment 502");
 			r.in.info.info502->permissions = 0;
 			r.in.info.info502->max_users = 502;
 			r.in.info.info502->current_users = 1;
-			r.in.info.info502->path = talloc_strdup(mem_ctx, "C:\\");
+			r.in.info.info502->path = talloc_strdup(tctx, "C:\\");
 			r.in.info.info502->password = NULL;
 			r.in.info.info502->unknown = 0;
 			r.in.info.info502->sd = NULL;
 			break;
 		case 1004:
-			r.in.info.info1004 = talloc(mem_ctx, struct srvsvc_NetShareInfo1004);
-			r.in.info.info1004->comment = talloc_strdup(mem_ctx, "test comment 1004");
+			r.in.info.info1004 = talloc(tctx, struct srvsvc_NetShareInfo1004);
+			r.in.info.info1004->comment = talloc_strdup(tctx, "test comment 1004");
 			break;
 		case 1005:
-			r.in.info.info1005 = talloc(mem_ctx, struct srvsvc_NetShareInfo1005);
+			r.in.info.info1005 = talloc(tctx, struct srvsvc_NetShareInfo1005);
 			r.in.info.info1005->dfs_flags = 0;
 			break;
 		case 1006:
-			r.in.info.info1006 = talloc(mem_ctx, struct srvsvc_NetShareInfo1006);
+			r.in.info.info1006 = talloc(tctx, struct srvsvc_NetShareInfo1006);
 			r.in.info.info1006->max_users = 1006;
 			break;
 /*		case 1007:
-			r.in.info.info1007 = talloc(mem_ctx, struct srvsvc_NetShareInfo1007);
+			r.in.info.info1007 = talloc(tctx, struct srvsvc_NetShareInfo1007);
 			r.in.info.info1007->flags = 0;
-			r.in.info.info1007->alternate_directory_name = talloc_strdup(mem_ctx, "test");
+			r.in.info.info1007->alternate_directory_name = talloc_strdup(tctx, "test");
 			break;
 */
 		case 1501:
-			r.in.info.info1501 = talloc_zero(mem_ctx, struct sec_desc_buf);
+			r.in.info.info1501 = talloc_zero(tctx, struct sec_desc_buf);
 			break;
 		}
 		
-		status = dcerpc_srvsvc_NetShareSetInfo(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetShareGetInfo level %u on share '%s' failed - %s\n",
-				r.in.level, r.in.share_name, nt_errstr(status));
-			ret = False;
-			continue;
-		} else if (!W_ERROR_EQUAL(r.out.result, levels[i].expected)) {
-			d_printf("NetShareSetInfo level %u on share '%s' failed - %s (expected %s)\n",
-				r.in.level, r.in.share_name, win_errstr(r.out.result),
-				win_errstr(levels[i].expected));
-			ret = False;
-			continue;
-		}
+		status = dcerpc_srvsvc_NetShareSetInfo(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetShareGetInfo failed");
+		torture_assert_werr_equal(tctx, r.out.result, levels[i].expected, "NetShareSetInfo failed");
 		
 		q.in.share_name = r.in.share_name;
 
-		status = dcerpc_srvsvc_NetShareGetInfo(p, mem_ctx, &q);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetShareGetInfo level %u on share '%s' failed - %s\n",
-				q.in.level, q.in.share_name, nt_errstr(status));
-			ret = False;
-			continue;
-		} else if (!W_ERROR_EQUAL(q.out.result, WERR_OK)) {
-			d_printf("NetShareGetInfo level %u on share '%s' failed - %s\n",
-				q.in.level, q.in.share_name, win_errstr(q.out.result));
-			ret = False;
-			continue;
-		}
+		status = dcerpc_srvsvc_NetShareGetInfo(p, tctx, &q);
+		torture_assert_ntstatus_ok(tctx, status, "NetShareGetInfo failed");
+		torture_assert_werr_ok(tctx, q.out.result, "NetShareGetInfo failed");
+
+		torture_assert_str_equal(tctx, q.out.info.info502->name, r.in.share_name, 
+					 "share name invalid");
 
-		if (strcmp(q.out.info.info502->name, r.in.share_name) != 0) {
-			ret = False;
-		}
 		switch (levels[i].level) {
 		case 0:
 			break;
 		case 1:
-			if (strcmp(q.out.info.info502->comment, "test comment 1") != 0)
-				ret = False;
+			torture_assert_str_equal(tctx, q.out.info.info502->comment, "test comment 1", "comment");
 			break;
 		case 2:
-			if (strcmp(q.out.info.info502->comment, "test comment 2") != 0)
-				ret = False;
-			if (q.out.info.info2->max_users != 2)
-				ret = False;
-			if (strcmp(q.out.info.info2->path, "C:\\") != 0)
-				ret = False;
+			torture_assert_str_equal(tctx, q.out.info.info502->comment, "test comment 2", "comment");
+			torture_assert_int_equal(tctx, q.out.info.info2->max_users, 2, "max users");
+			torture_assert_str_equal(tctx, q.out.info.info2->path, "C:\\", "path");
 			break;
 		case 501:
-			if (strcmp(q.out.info.info501->comment, "test comment 501") != 0)
-				ret = False;
+			torture_assert_str_equal(tctx, q.out.info.info501->comment, "test comment 501", "comment");
 			break;
 		case 502:
-			if (strcmp(q.out.info.info502->comment, "test comment 502") != 0)
-				ret = False;
-			if (q.out.info.info2->max_users != 502)
-				ret = False;
-			if (strcmp(q.out.info.info2->path, "C:\\") != 0)
-				ret = False;
+			torture_assert_str_equal(tctx, q.out.info.info502->comment, "test comment 502", "comment");
+			torture_assert_int_equal(tctx, q.out.info.info2->max_users, 502, "max users");
+			torture_assert_str_equal(tctx, q.out.info.info2->path, "C:\\", "path");
 			break;
 		case 1004:
-			if (strcmp(q.out.info.info502->comment, "test comment 1004") != 0)
-				ret = False;
+			torture_assert_str_equal(tctx, q.out.info.info502->comment, "test comment 1004", 
+						 "comment");
 			break;
 		case 1005:
 			break;
 		case 1006:
-			if (q.out.info.info2->max_users != 1006)
-				ret = False;
+			torture_assert_int_equal(tctx, q.out.info.info2->max_users, 1006, "Max users");
 			break;
 /*		case 1007:
 			break;
@@ -710,25 +599,19 @@ static BOOL test_NetShareAddSetDel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	d.in.share_name = r.in.share_name;
 	d.in.reserved = 0;
 
-	status = dcerpc_srvsvc_NetShareDel(p, mem_ctx, &d);
-	if (!NT_STATUS_IS_OK(status)) {
-		d_printf("NetShareDel on share 'testshare502' failed - %s\n",
-			 nt_errstr(status));
-		ret = False;
-	} else if (!W_ERROR_EQUAL(a.out.result, WERR_OK)) {
-		d_printf("NetShareDel on share 'testshare502' failed - %s\n",
-			 win_errstr(d.out.result));
-		ret = False;
-	}
+	status = dcerpc_srvsvc_NetShareDel(p, tctx, &d);
+	torture_assert_ntstatus_ok(tctx, status, "NetShareDel on share 'testshare502' failed");
+	torture_assert_werr_ok(tctx, a.out.result, "NetShareDel on share 'testshare502' failed");
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetShare        */
 /**************************/
-static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p, 
-				 TALLOC_CTX *mem_ctx, BOOL admin)
+static bool test_NetShareEnumAll(struct torture_context *tctx, 
+				 struct dcerpc_pipe *p, 
+				 bool admin)
 {
 	NTSTATUS status;
 	struct srvsvc_NetShareEnumAll r;
@@ -745,12 +628,11 @@ static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p,
 		 { 502,	WERR_ACCESS_DENIED,	WERR_OK },
 	};
 	int i;
-	BOOL ret = True;
 	uint32_t resume_handle;
 
 	ZERO_STRUCT(c0);
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.ctr.ctr0 = &c0;
 	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = &resume_handle;
@@ -767,37 +649,40 @@ static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p,
 		ZERO_STRUCT(r.out);
 		resume_handle = 0;
 
-		d_printf("testing NetShareEnumAll level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetShareEnumAll(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetShareEnumAll level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_EQUAL(r.out.result, expected)) {
-			d_printf("NetShareEnumAll level %u failed - %s (expected %s)\n",
-				r.in.level, win_errstr(r.out.result),
-				win_errstr(expected));
-			continue;
-		}
+		torture_comment(tctx, "testing NetShareEnumAll level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetShareEnumAll(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetShareEnumAll failed");
+		torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareEnumAll failed");
 
 		/* call srvsvc_NetShareGetInfo for each returned share */
 		if (r.in.level == 2 && r.out.ctr.ctr2) {
 			for (j=0;j<r.out.ctr.ctr2->count;j++) {
 				const char *name;
 				name = r.out.ctr.ctr2->array[j].name;
-				if (!test_NetShareGetInfo(p, mem_ctx, name, admin)) {
-					ret = False;
+				if (!test_NetShareGetInfo(tctx, p, name, admin)) {
+					return false;
 				}
 			}
 		}
 	}
 
-	return ret;
+	return true;
+}
+
+static bool test_NetShareEnumAllFull(struct torture_context *tctx,
+			      struct dcerpc_pipe *p)
+{
+	return test_NetShareEnumAll(tctx, p, true);
 }
 
-static BOOL test_NetShareEnum(struct dcerpc_pipe *p, 
-			      TALLOC_CTX *mem_ctx, BOOL admin)
+static bool test_NetShareEnumAllAnon(struct torture_context *tctx,
+			      struct dcerpc_pipe *p)
+{
+	return test_NetShareEnumAll(tctx, p, false);
+}
+
+static bool test_NetShareEnum(struct torture_context *tctx,
+			      struct dcerpc_pipe *p, bool admin)
 {
 	NTSTATUS status;
 	struct srvsvc_NetShareEnum r;
@@ -814,9 +699,8 @@ static BOOL test_NetShareEnum(struct dcerpc_pipe *p,
 		 { 502,	WERR_ACCESS_DENIED,	WERR_OK },
 	};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
@@ -832,73 +716,67 @@ static BOOL test_NetShareEnum(struct dcerpc_pipe *p,
 
 		ZERO_STRUCT(r.out);
 
-		d_printf("testing NetShareEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetShareEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetShareEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_EQUAL(r.out.result, expected)) {
-			d_printf("NetShareEnum level %u failed - %s (expected %s)\n",
-				r.in.level, win_errstr(r.out.result),
-				win_errstr(expected));
-			continue;
-		}
+		torture_comment(tctx, "testing NetShareEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetShareEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetShareEnum failed");
+		torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareEnum failed");
 	}
 
-	return ret;
+	return true;
+}
+
+static bool test_NetShareEnumFull(struct torture_context *tctx,
+				  struct dcerpc_pipe *p)
+{
+	return test_NetShareEnum(tctx, p, true);
+}
+
+static bool test_NetShareEnumAnon(struct torture_context *tctx,
+				  struct dcerpc_pipe *p)
+{
+	return test_NetShareEnum(tctx, p, false);
 }
 
 /**************************/
 /* srvsvc_NetSrv          */
 /**************************/
-static BOOL test_NetSrvGetInfo(struct dcerpc_pipe *p, 
-				 TALLOC_CTX *mem_ctx)
+static bool test_NetSrvGetInfo(struct torture_context *tctx, 
+							   struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetSrvGetInfo r;
 	struct srvsvc_NetSrvInfo503 i503;
 	uint32_t levels[] = {100, 101, 102, 502, 503};
 	int i;
-	BOOL ret = True;
 	uint32_t resume_handle;
 
 	ZERO_STRUCT(i503);
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		resume_handle = 0;
 		r.in.level = levels[i];
-		d_printf("testing NetSrvGetInfo level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetSrvGetInfo(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetSrvGetInfo level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetSrvGetInfo level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetSrvGetInfo level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetSrvGetInfo(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetSrvGetInfo failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetSrvGetInfo failed");
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetDisk         */
 /**************************/
-static BOOL test_NetDiskEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetDiskEnum(struct torture_context *tctx, 
+			     struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetDiskEnum r;
 	uint32_t levels[] = {0};
 	int i;
-	BOOL ret = True;
 	uint32_t resume_handle=0;
 
 	ZERO_STRUCT(r.in);
@@ -908,37 +786,28 @@ static BOOL test_NetDiskEnum(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetDiskEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetDiskEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			NDR_PRINT_OUT_DEBUG(srvsvc_NetDiskEnum, &r);
-			d_printf("NetDiskEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetDiskEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetDiskEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetDiskEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetDiskEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetDiskEnum failed");
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetTransport    */
 /**************************/
-static BOOL test_NetTransportEnum(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetTransportEnum(struct torture_context *tctx, 
+								  struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetTransportEnum r;
 	struct srvsvc_NetTransportCtr0 c0;
 	uint32_t levels[] = {0, 1};
 	int i;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.transports.ctr0 = &c0;
 	r.in.transports.ctr0->count = 0;
 	r.in.transports.ctr0->array = NULL;
@@ -948,54 +817,41 @@ static BOOL test_NetTransportEnum(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.level = levels[i];
-		d_printf("testing NetTransportEnum level %u\n", r.in.level);
-		status = dcerpc_srvsvc_NetTransportEnum(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("NetTransportEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-			ret = False;
-			continue;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("NetTransportEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
-			continue;
-		}
+		torture_comment(tctx, "testing NetTransportEnum level %u\n", r.in.level);
+		status = dcerpc_srvsvc_NetTransportEnum(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "NetTransportEnum failed");
+		torture_assert_werr_ok(tctx, r.out.result, "NetTransportEnum failed");
 	}
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetRemoteTOD    */
 /**************************/
-static BOOL test_NetRemoteTOD(struct dcerpc_pipe *p, 
-			   TALLOC_CTX *mem_ctx)
+static bool test_NetRemoteTOD(struct torture_context *tctx, 
+			      struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetRemoteTOD r;
-	BOOL ret = True;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 
 	ZERO_STRUCT(r.out);
-	d_printf("testing NetRemoteTOD\n");
-	status = dcerpc_srvsvc_NetRemoteTOD(p, mem_ctx, &r);
-	if (!NT_STATUS_IS_OK(status)) {
-		d_printf("NetRemoteTOD failed - %s\n", nt_errstr(status));
-		ret = False;
-	}
-	if (!W_ERROR_IS_OK(r.out.result)) {
-		d_printf("NetRemoteTOD failed - %s\n", win_errstr(r.out.result));
-	}
+	torture_comment(tctx, "testing NetRemoteTOD\n");
+	status = dcerpc_srvsvc_NetRemoteTOD(p, tctx, &r);
+	torture_assert_ntstatus_ok(tctx, status, "NetRemoteTOD failed");
+	torture_assert_werr_ok(tctx, r.out.result, "NetRemoteTOD failed");
 
-	return ret;
+	return true;
 }
 
 /**************************/
 /* srvsvc_NetName         */
 /**************************/
 
-static BOOL test_NetNameValidate(struct dcerpc_pipe *p,
-				 TALLOC_CTX *mem_ctx)
+static bool test_NetNameValidate(struct torture_context *tctx, 
+								 struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
 	struct srvsvc_NetNameValidate r;
@@ -1003,7 +859,7 @@ static BOOL test_NetNameValidate(struct dcerpc_pipe *p,
 	char *name;
 	int i, n, min, max;
 
-	r.in.server_unc = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+	r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.flags = 0x0;
 
 	d_printf("testing NetNameValidate\n");
@@ -1013,7 +869,7 @@ static BOOL test_NetNameValidate(struct dcerpc_pipe *p,
 
 again:
 		/* let's limit ourselves to a maximum of 4096 bytes */
-		r.in.name = name = talloc_array(mem_ctx, char, 4097);
+		r.in.name = name = talloc_array(tctx, char, 4097);
 		max = 4096;
 		min = 0;
 		n = max;
@@ -1026,7 +882,7 @@ again:
 			memset(name, 'A', n);
 			name[n] = '\0';
 
-			status = dcerpc_srvsvc_NetNameValidate(p, mem_ctx, &r);
+			status = dcerpc_srvsvc_NetNameValidate(p, tctx, &r);
 			if (!NT_STATUS_IS_OK(status)) {
 				d_printf("NetNameValidate failed while checking maximum size (%s)\n",
 						nt_errstr(status));
@@ -1047,18 +903,18 @@ again:
 			}
 		}
 
-		talloc_free(r.in.name);
+		talloc_free(name);
 
 		d_printf("Maximum length for type %2d, flags %08x: %d\n", i, r.in.flags, max);
 
 		/* find invalid chars for this type check only ASCII between 0x20 and 0x7e */
 
-		invalidc = talloc_strdup(mem_ctx, "");
+		invalidc = talloc_strdup(tctx, "");
 
 		for (n = 0x20; n < 0x7e; n++) {
-			r.in.name = talloc_asprintf(mem_ctx, "%c", (char)n);
+			r.in.name = name = talloc_asprintf(tctx, "%c", (char)n);
 
-			status = dcerpc_srvsvc_NetNameValidate(p, mem_ctx, &r);
+			status = dcerpc_srvsvc_NetNameValidate(p, tctx, &r);
 			if (!NT_STATUS_IS_OK(status)) {
 				d_printf("NetNameValidate failed while checking valid chars (%s)\n",
 						nt_errstr(status));
@@ -1069,7 +925,7 @@ again:
 				invalidc = talloc_asprintf_append(invalidc, "%c", (char)n);
 			}
 
-			talloc_free(r.in.name);
+			talloc_free(name);
 		}
 
 		d_printf(" Invalid chars for type %2d, flags %08x: \"%s\"\n", i, r.in.flags, invalidc);
@@ -1083,63 +939,44 @@ again:
 		r.in.flags = 0x0;
 	}
 
-	return True;
+	return true;
 }
 
-BOOL torture_rpc_srvsvc(struct torture_context *torture)
+struct torture_suite *torture_rpc_srvsvc(TALLOC_CTX *mem_ctx)
 {
-        NTSTATUS status;
-        struct dcerpc_pipe *p;
-	TALLOC_CTX *mem_ctx;
-	BOOL ret = True;
-	const char *binding = torture_setting_string(torture, "binding", NULL);
-	struct cli_credentials *anon_credentials;
-
-	mem_ctx = talloc_init("torture_rpc_srvsvc");
-
-	status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_srvsvc);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		return False;
-	}
-
-	ret &= test_NetCharDevEnum(p, mem_ctx);
-	ret &= test_NetCharDevQEnum(p, mem_ctx);
-	ret &= test_NetConnEnum(p, mem_ctx);
-	ret &= test_NetFileEnum(p, mem_ctx);
-	ret &= test_NetSessEnum(p, mem_ctx);
-	ret &= test_NetShareEnumAll(p, mem_ctx, True);
-	ret &= test_NetSrvGetInfo(p, mem_ctx);
-	ret &= test_NetDiskEnum(p, mem_ctx);
-	ret &= test_NetTransportEnum(p, mem_ctx);
-	ret &= test_NetRemoteTOD(p, mem_ctx);
-	ret &= test_NetShareEnum(p, mem_ctx, True);
-	ret &= test_NetShareGetInfo(p, mem_ctx, "ADMIN$", True);
-/*	ret &= test_NetShareAddSetDel(p, mem_ctx); */
-	ret &= test_NetNameValidate(p, mem_ctx);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "SRVSVC");
+	struct torture_rpc_tcase *tcase;
+	struct torture_test *test;
+
+	tcase = torture_suite_add_rpc_iface_tcase(suite, "srvsvc (admin access)", &ndr_table_srvsvc);
+
+	torture_rpc_tcase_add_test(tcase, "NetCharDevEnum", test_NetCharDevEnum);
+	torture_rpc_tcase_add_test(tcase, "NetCharDevQEnum", test_NetCharDevQEnum);
+	torture_rpc_tcase_add_test(tcase, "NetConnEnum", test_NetConnEnum);
+	torture_rpc_tcase_add_test(tcase, "NetFileEnum", test_NetFileEnum);
+	torture_rpc_tcase_add_test(tcase, "NetSessEnum", test_NetSessEnum);
+	torture_rpc_tcase_add_test(tcase, "NetShareEnumAll", test_NetShareEnumAllFull);
+	torture_rpc_tcase_add_test(tcase, "NetSrvGetInfo", test_NetSrvGetInfo);
+	torture_rpc_tcase_add_test(tcase, "NetDiskEnum", test_NetDiskEnum);
+	torture_rpc_tcase_add_test(tcase, "NetTransportEnum", test_NetTransportEnum);
+	torture_rpc_tcase_add_test(tcase, "NetRemoteTOD", test_NetRemoteTOD);
+	torture_rpc_tcase_add_test(tcase, "NetShareEnum", test_NetShareEnumFull);
+	torture_rpc_tcase_add_test(tcase, "NetShareGetInfo", test_NetShareGetInfoAdminFull);
+	test = torture_rpc_tcase_add_test(tcase, "NetShareAddSetDel", 
+					   test_NetShareAddSetDel);
+	test->dangerous = true;
+	torture_rpc_tcase_add_test(tcase, "NetNameValidate", test_NetNameValidate);
 	
-	status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_srvsvc);
-
-	if (!binding) {
-		d_printf("You must specify a ncacn binding string\n");
-		return False;
-	}
-
-	anon_credentials = cli_credentials_init_anon(mem_ctx);
-
-	status = dcerpc_pipe_connect(mem_ctx, 
-				     &p, binding, &dcerpc_table_srvsvc,
-				     anon_credentials, NULL);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(mem_ctx);
-		return False;
-	}
-
-	ret &= test_NetShareEnumAll(p, mem_ctx, False);
-	ret &= test_NetShareEnum(p, mem_ctx, False);
-	ret &= test_NetShareGetInfo(p, mem_ctx, "ADMIN$", False);
-
-	talloc_free(mem_ctx);
-
-	return ret;
+	tcase = torture_suite_add_anon_rpc_iface_tcase(suite, 
+						    "srvsvc anonymous access", 
+						    &ndr_table_srvsvc);
+
+	torture_rpc_tcase_add_test(tcase, "NetShareEnumAll", 
+				   test_NetShareEnumAllAnon);
+	torture_rpc_tcase_add_test(tcase, "NetShareEnum", 
+				   test_NetShareEnumAnon);
+	torture_rpc_tcase_add_test(tcase, "NetShareGetInfo", 
+				   test_NetShareGetInfoAdminAnon);
+
+	return suite;
 }