s4-smbtorture: Make test names lowercase and dot-separated.
[metze/samba/wip.git] / source4 / torture / rpc / srvsvc.c
index b99570f81d180a7832b3336efdea804b73e0f7eb..21b67fda3bd06c9cfa19af07b9cf5bf35af02bc7 100644 (file)
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
 
 /**************************/
 /* 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;
+       union srvsvc_NetCharDevInfo info;
        uint32_t levels[] = {0, 1};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       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;
+       r.out.info = &info;
 
        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_r(b, 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;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       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_r(b, 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 torture_context *tctx, 
@@ -98,94 +81,97 @@ static bool test_NetCharDevEnum(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct srvsvc_NetCharDevEnum r;
+       struct srvsvc_NetCharDevInfoCtr info_ctr;
        struct srvsvc_NetCharDevCtr0 c0;
+       struct srvsvc_NetCharDevCtr0 c1;
+       uint32_t totalentries = 0;
        uint32_t levels[] = {0, 1};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(info_ctr);
 
        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;
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
+       r.out.info_ctr = &info_ctr;
+       r.out.totalentries = &totalentries;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int j;
 
+               info_ctr.level = levels[i];
 
-               ZERO_STRUCT(r.out);
-               r.in.level = levels[i];
-               printf("testing NetCharDevEnum level %u\n", r.in.level);
-               status = dcerpc_srvsvc_NetCharDevEnum(p, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetCharDevEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
+               switch(info_ctr.level) {
+               case 0:
+                       ZERO_STRUCT(c0);
+                       info_ctr.ctr.ctr0 = &c0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(c1);
+                       info_ctr.ctr.ctr0 = &c1;
+                       break;
                }
+
+               torture_comment(tctx, "Testing NetCharDevEnum level %u\n", info_ctr.level);
+               status = dcerpc_srvsvc_NetCharDevEnum_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetCharDevEnum failed");
                if (!W_ERROR_IS_OK(r.out.result)) {
-                       d_printf("NetCharDevEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
+                       torture_comment(tctx, "NetCharDevEnum failed: %s\n", win_errstr(r.out.result));
                        continue;
                }
 
                /* 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++) {
+               if (info_ctr.level == 1) {
+                       for (j=0;j<r.out.info_ctr->ctr.ctr1->count;j++) {
                                const char *device;
-                               device = r.out.ctr.ctr1->array[j].device;
+                               device = r.out.info_ctr->ctr.ctr1->array[j].device;
                                if (!test_NetCharDevGetInfo(p, tctx, device)) {
-                                       ret = False;
+                                       return false;
                                }
                                if (!test_NetCharDevControl(p, tctx, device)) {
-                                       ret = False;
+                                       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;
+       union srvsvc_NetCharDevQInfo info;
        uint32_t levels[] = {0, 1};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       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");
+       r.out.info = &info;
 
        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_r(b, 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;
@@ -193,7 +179,8 @@ 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;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
        r.in.queue_name = devicequeue;
@@ -221,11 +208,11 @@ static BOOL test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        break;
                }
                r.in.parm_error = &parm_error;
-               status = dcerpc_srvsvc_NetCharDevQSetInfo(p, mem_ctx, &r);
+               status = dcerpc_srvsvc_NetCharDevQSetInfo_r(b, mem_ctx, &r);
                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)) {
@@ -239,205 +226,259 @@ static BOOL test_NetCharDevQSetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 #endif
 
-static BOOL test_NetCharDevQEnum(struct torture_context *tctx, 
-                                                                struct dcerpc_pipe *p)
+static bool test_NetCharDevQEnum(struct torture_context *tctx, 
+                                struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetCharDevQEnum r;
+       struct srvsvc_NetCharDevQInfoCtr info_ctr;
        struct srvsvc_NetCharDevQCtr0 c0;
+       struct srvsvc_NetCharDevQCtr1 c1;
+       uint32_t totalentries = 0;
        uint32_t levels[] = {0, 1};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(info_ctr);
 
        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;
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
+       r.out.totalentries = &totalentries;
+       r.out.info_ctr = &info_ctr;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int j;
 
-               ZERO_STRUCT(r.out);
-               r.in.level = levels[i];
-               printf("testing NetCharDevQEnum level %u\n", r.in.level);
-               status = dcerpc_srvsvc_NetCharDevQEnum(p, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetCharDevQEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
+               info_ctr.level = levels[i];
+
+               switch (info_ctr.level) {
+               case 0:
+                       ZERO_STRUCT(c0);
+                       info_ctr.ctr.ctr0 = &c0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(c1);
+                       info_ctr.ctr.ctr1 = &c1;
+                       break;
                }
+               torture_comment(tctx, "Testing NetCharDevQEnum level %u\n", info_ctr.level);
+               status = dcerpc_srvsvc_NetCharDevQEnum_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetCharDevQEnum failed");
                if (!W_ERROR_IS_OK(r.out.result)) {
-                       d_printf("NetCharDevQEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result));
+                       torture_comment(tctx, "NetCharDevQEnum failed: %s\n", win_errstr(r.out.result));
                        continue;
                }
 
                /* 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++) {
+               if (info_ctr.level == 1) {
+                       for (j=0;j<r.out.info_ctr->ctr.ctr1->count;j++) {
                                const char *device;
-                               device = r.out.ctr.ctr1->array[j].device;
+                               device = r.out.info_ctr->ctr.ctr1->array[j].device;
                                if (!test_NetCharDevQGetInfo(p, tctx, device)) {
-                                       ret = False;
+                                       return false;
                                }
                        }
                }
        }
 
-       return ret;
+       return true;
 }
 
 /**************************/
 /* srvsvc_NetConn         */
 /**************************/
-static BOOL test_NetConnEnum(struct torture_context *tctx,
-                                                        struct dcerpc_pipe *p)
+static bool test_NetConnEnum(struct torture_context *tctx,
+                            struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetConnEnum r;
+       struct srvsvc_NetConnInfoCtr info_ctr;
        struct srvsvc_NetConnCtr0 c0;
+       struct srvsvc_NetConnCtr1 c1;
+       uint32_t totalentries = 0;
        uint32_t levels[] = {0, 1};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(info_ctr);
 
        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;
+       r.in.path = talloc_asprintf(tctx,"%s","IPC$");
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
+       r.out.totalentries = &totalentries;
+       r.out.info_ctr = &info_ctr;
 
        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, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetConnEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
+               info_ctr.level = levels[i];
+
+               switch (info_ctr.level) {
+               case 0:
+                       ZERO_STRUCT(c0);
+                       info_ctr.ctr.ctr0 = &c0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(c1);
+                       info_ctr.ctr.ctr1 = &c1;
+                       break;
                }
+
+               torture_comment(tctx, "Testing NetConnEnum level %u\n", info_ctr.level);
+               status = dcerpc_srvsvc_NetConnEnum_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetConnEnum failed");
                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, "NetConnEnum failed: %s\n", win_errstr(r.out.result));
                }
        }
 
-       return ret;
+       return true;
 }
 
 /**************************/
 /* srvsvc_NetFile         */
 /**************************/
-static BOOL test_NetFileEnum(struct torture_context *tctx,
-                                                        struct dcerpc_pipe *p)
+static bool test_NetFileEnum(struct torture_context *tctx,
+                            struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetFileEnum r;
+       struct srvsvc_NetFileInfoCtr info_ctr;
+       struct srvsvc_NetFileCtr2 c2;
        struct srvsvc_NetFileCtr3 c3;
+       uint32_t totalentries = 0;
        uint32_t levels[] = {2, 3};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(info_ctr);
 
        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;
-       r.in.ctr.ctr3->count = 0;
-       r.in.ctr.ctr3->array = NULL;
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)4096;
        r.in.resume_handle = NULL;
+       r.out.totalentries = &totalentries;
+       r.out.info_ctr = &info_ctr;
 
        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, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetFileEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
+               info_ctr.level = levels[i];
+
+               switch (info_ctr.level) {
+               case 2:
+                       ZERO_STRUCT(c2);
+                       info_ctr.ctr.ctr2 = &c2;
+                       break;
+               case 3:
+                       ZERO_STRUCT(c3);
+                       info_ctr.ctr.ctr3 = &c3;
+                       break;
                }
+               torture_comment(tctx, "Testing NetFileEnum level %u\n", info_ctr.level);
+               status = dcerpc_srvsvc_NetFileEnum_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetFileEnum failed");
                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, "NetFileEnum failed: %s\n", win_errstr(r.out.result));
                }
        }
 
-       return ret;
+       return true;
 }
 
 /**************************/
 /* srvsvc_NetSess         */
 /**************************/
-static BOOL test_NetSessEnum(struct torture_context *tctx,
-                                                        struct dcerpc_pipe *p)
+static bool test_NetSessEnum(struct torture_context *tctx,
+                            struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetSessEnum r;
+       struct srvsvc_NetSessInfoCtr info_ctr;
        struct srvsvc_NetSessCtr0 c0;
+       struct srvsvc_NetSessCtr1 c1;
+       struct srvsvc_NetSessCtr2 c2;
+       struct srvsvc_NetSessCtr10 c10;
+       struct srvsvc_NetSessCtr502 c502;
+       uint32_t totalentries = 0;
        uint32_t levels[] = {0, 1, 2, 10, 502};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(info_ctr);
 
        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;
-       r.in.ctr.ctr0->count = 0;
-       r.in.ctr.ctr0->array = NULL;
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
+       r.out.totalentries = &totalentries;
+       r.out.info_ctr = &info_ctr;
 
        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, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetSessEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
+               info_ctr.level = levels[i];
+
+               switch (info_ctr.level) {
+               case 0:
+                       ZERO_STRUCT(c0);
+                       info_ctr.ctr.ctr0 = &c0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(c1);
+                       info_ctr.ctr.ctr1 = &c1;
+                       break;
+               case 2:
+                       ZERO_STRUCT(c2);
+                       info_ctr.ctr.ctr2 = &c2;
+                       break;
+               case 10:
+                       ZERO_STRUCT(c10);
+                       info_ctr.ctr.ctr10 = &c10;
+                       break;
+               case 502:
+                       ZERO_STRUCT(c502);
+                       info_ctr.ctr.ctr502 = &c502;
+                       break;
                }
+
+               torture_comment(tctx, "Testing NetSessEnum level %u\n", info_ctr.level);
+               status = dcerpc_srvsvc_NetSessEnum_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetSessEnum failed");
                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, "NetSessEnum failed: %s\n", win_errstr(r.out.result));
                }
        }
 
-       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;
+       enum srvsvc_ShareType type;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       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;
+       r.out.type = &type;
 
-       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_r(b, 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 torture_context *tctx, 
@@ -446,6 +487,7 @@ static bool test_NetShareGetInfo(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct srvsvc_NetShareGetInfo r;
+       union srvsvc_NetShareInfo info;
        struct {
                uint32_t level;
                WERROR anon_status;
@@ -459,10 +501,11 @@ static bool test_NetShareGetInfo(struct torture_context *tctx,
                 { 1005,        WERR_OK,                WERR_OK },
        };
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.share_name = sharename;
+       r.out.info = &info;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                WERROR expected;
@@ -470,46 +513,34 @@ static bool test_NetShareGetInfo(struct torture_context *tctx,
                r.in.level = levels[i].level;
                expected = levels[i].anon_status;
                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, tctx, &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_r(b, 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, tctx, r.out.info.info2->path)) {
-                       ret = False;
+               if (!r.out.info->info2 || !r.out.info->info2->path) continue;
+               if (!test_NetShareCheck(p, tctx, r.out.info->info2->path)) {
+                       return false;
                }
        }
 
-       return ret;
+       return true;
 }
 
 static bool test_NetShareGetInfoAdminFull(struct torture_context *tctx, 
                                          struct dcerpc_pipe *p)
 {
-       return test_NetShareGetInfo(tctx, p, "ADMIN$", true);
+       return test_NetShareGetInfo(tctx, p, "IPC$", true);
 }
 
 static bool test_NetShareGetInfoAdminAnon(struct torture_context *tctx, 
                                          struct dcerpc_pipe *p)
 {
-       return test_NetShareGetInfo(tctx, p, "ADMIN$", false);
+       return test_NetShareGetInfo(tctx, p, "IPC$", false);
 }
 
 static bool test_NetShareAddSetDel(struct torture_context *tctx, 
@@ -520,6 +551,8 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx,
        struct srvsvc_NetShareSetInfo r;
        struct srvsvc_NetShareGetInfo q;
        struct srvsvc_NetShareDel d;
+       struct sec_desc_buf sd_buf;
+       union srvsvc_NetShareInfo info;
        struct {
                uint32_t level;
                WERROR expected;
@@ -536,40 +569,29 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx,
                 { 1501,        WERR_OK },
        };
        int i;
-       BOOL ret = True;
-
-       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
-               d_printf("NetShareAddSetDel disabled - enable dangerous tests to use\n");
-               return True;
-       }
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        a.in.server_unc = r.in.server_unc = q.in.server_unc = d.in.server_unc =
                talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.share_name = talloc_strdup(tctx, "testshare");
 
+       info.info2 = talloc(tctx, struct srvsvc_NetShareInfo2);
+       info.info2->name = r.in.share_name;
+       info.info2->type = STYPE_DISKTREE;
+       info.info2->comment = talloc_strdup(tctx, "test comment");
+       info.info2->permissions = 123434566;
+       info.info2->max_users = -1;
+       info.info2->current_users = 0;
+       info.info2->path = talloc_strdup(tctx, "C:\\");
+       info.info2->password = NULL;
+
+       a.in.info = &info;
        a.in.level = 2;
-       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(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(tctx, "C:\\");
-       a.in.info.info2->password = NULL;
-
        a.in.parm_error = NULL;
 
-       status = dcerpc_srvsvc_NetShareAdd(p, tctx, &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_r(b, 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;
 
@@ -580,142 +602,117 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx,
                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(tctx, struct srvsvc_NetShareInfo0);
-                       r.in.info.info0->name = r.in.share_name;
+                       info.info0 = talloc(tctx, struct srvsvc_NetShareInfo0);
+                       info.info0->name = r.in.share_name;
                        break;
                case 1:
-                       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(tctx, "test comment 1");
+                       info.info1 = talloc(tctx, struct srvsvc_NetShareInfo1);
+                       info.info1->name = r.in.share_name;
+                       info.info1->type = STYPE_DISKTREE;
+                       info.info1->comment = talloc_strdup(tctx, "test comment 1");
                        break;
                case 2: 
-                       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(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(tctx, "::BLaH::"); /* "C:\\"); */
-                       r.in.info.info2->password = NULL;
+                       info.info2 = talloc(tctx, struct srvsvc_NetShareInfo2);
+                       info.info2->name = r.in.share_name;
+                       info.info2->type = STYPE_DISKTREE;
+                       info.info2->comment = talloc_strdup(tctx, "test comment 2");
+                       info.info2->permissions = 0;
+                       info.info2->max_users = 2;
+                       info.info2->current_users = 1;
+                       info.info2->path = talloc_strdup(tctx, "::BLaH::"); /* "C:\\"); */
+                       info.info2->password = NULL;
                        break;
                case 501:
-                       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(tctx, "test comment 501");
-                       r.in.info.info501->csc_policy = 0;
+                       info.info501 = talloc(tctx, struct srvsvc_NetShareInfo501);
+                       info.info501->name = r.in.share_name;
+                       info.info501->type = STYPE_DISKTREE;
+                       info.info501->comment = talloc_strdup(tctx, "test comment 501");
+                       info.info501->csc_policy = 0;
                        break;
                case 502:
-                       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(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(tctx, "C:\\");
-                       r.in.info.info502->password = NULL;
-                       r.in.info.info502->unknown = 0;
-                       r.in.info.info502->sd = NULL;
+                       ZERO_STRUCT(sd_buf);
+                       info.info502 = talloc(tctx, struct srvsvc_NetShareInfo502);
+                       info.info502->name = r.in.share_name;
+                       info.info502->type = STYPE_DISKTREE;
+                       info.info502->comment = talloc_strdup(tctx, "test comment 502");
+                       info.info502->permissions = 0;
+                       info.info502->max_users = 502;
+                       info.info502->current_users = 1;
+                       info.info502->path = talloc_strdup(tctx, "C:\\");
+                       info.info502->password = NULL;
+                       info.info502->sd_buf = sd_buf;
                        break;
                case 1004:
-                       r.in.info.info1004 = talloc(tctx, struct srvsvc_NetShareInfo1004);
-                       r.in.info.info1004->comment = talloc_strdup(tctx, "test comment 1004");
+                       info.info1004 = talloc(tctx, struct srvsvc_NetShareInfo1004);
+                       info.info1004->comment = talloc_strdup(tctx, "test comment 1004");
                        break;
                case 1005:
-                       r.in.info.info1005 = talloc(tctx, struct srvsvc_NetShareInfo1005);
-                       r.in.info.info1005->dfs_flags = 0;
+                       info.info1005 = talloc(tctx, struct srvsvc_NetShareInfo1005);
+                       info.info1005->dfs_flags = 0;
                        break;
                case 1006:
-                       r.in.info.info1006 = talloc(tctx, struct srvsvc_NetShareInfo1006);
-                       r.in.info.info1006->max_users = 1006;
+                       info.info1006 = talloc(tctx, struct srvsvc_NetShareInfo1006);
+                       info.info1006->max_users = 1006;
                        break;
 /*             case 1007:
-                       r.in.info.info1007 = talloc(tctx, struct srvsvc_NetShareInfo1007);
-                       r.in.info.info1007->flags = 0;
-                       r.in.info.info1007->alternate_directory_name = talloc_strdup(tctx, "test");
+                       info.info1007 = talloc(tctx, struct srvsvc_NetShareInfo1007);
+                       info.info1007->flags = 0;
+                       info.info1007->alternate_directory_name = talloc_strdup(tctx, "test");
                        break;
 */
                case 1501:
-                       r.in.info.info1501 = talloc_zero(tctx, struct sec_desc_buf);
+                       info.info1501 = talloc_zero(tctx, struct sec_desc_buf);
                        break;
                }
-               
-               status = dcerpc_srvsvc_NetShareSetInfo(p, tctx, &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;
-               }
+
+               r.in.info = &info;
+
+               status = dcerpc_srvsvc_NetShareSetInfo_r(b, 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;
+               q.out.info = &info;
 
-               status = dcerpc_srvsvc_NetShareGetInfo(p, tctx, &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_r(b, 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->info2->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->info502->max_users, 502, "max users");
+                       torture_assert_str_equal(tctx, q.out.info->info502->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->info1004->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->info1006->max_users, 1006, "Max users");
                        break;
 /*             case 1007:
                        break;
@@ -728,18 +725,11 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx,
        d.in.share_name = r.in.share_name;
        d.in.reserved = 0;
 
-       status = dcerpc_srvsvc_NetShareDel(p, tctx, &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_r(b, 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;
 }
 
 /**************************/
@@ -751,7 +741,13 @@ static bool test_NetShareEnumAll(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct srvsvc_NetShareEnumAll r;
+       struct srvsvc_NetShareInfoCtr info_ctr;
        struct srvsvc_NetShareCtr0 c0;
+       struct srvsvc_NetShareCtr1 c1;
+       struct srvsvc_NetShareCtr2 c2;
+       struct srvsvc_NetShareCtr501 c501;
+       struct srvsvc_NetShareCtr502 c502;
+       uint32_t totalentries = 0;
        struct {
                uint32_t level;
                WERROR anon_status;
@@ -764,55 +760,72 @@ static bool test_NetShareEnumAll(struct torture_context *tctx,
                 { 502, WERR_ACCESS_DENIED,     WERR_OK },
        };
        int i;
-       BOOL ret = True;
        uint32_t resume_handle;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       ZERO_STRUCT(c0);
+       ZERO_STRUCT(info_ctr);
 
        r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
-       r.in.ctr.ctr0 = &c0;
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = &resume_handle;
        r.out.resume_handle = &resume_handle;
+       r.out.totalentries = &totalentries;
+       r.out.info_ctr = &info_ctr;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
+
                int j;
                WERROR expected;
 
-               r.in.level = levels[i].level;
+               info_ctr.level = levels[i].level;
+
+               switch (info_ctr.level) {
+               case 0:
+                       ZERO_STRUCT(c0);
+                       info_ctr.ctr.ctr0 = &c0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(c1);
+                       info_ctr.ctr.ctr1 = &c1;
+                       break;
+               case 2:
+                       ZERO_STRUCT(c2);
+                       info_ctr.ctr.ctr2 = &c2;
+                       break;
+               case 501:
+                       ZERO_STRUCT(c501);
+                       info_ctr.ctr.ctr501 = &c501;
+                       break;
+               case 502:
+                       ZERO_STRUCT(c502);
+                       info_ctr.ctr.ctr502 = &c502;
+                       break;
+               }
+
                expected = levels[i].anon_status;
                if (admin) expected = levels[i].admin_status;
 
-               ZERO_STRUCT(r.out);
                resume_handle = 0;
 
-               d_printf("testing NetShareEnumAll level %u\n", r.in.level);
-               status = dcerpc_srvsvc_NetShareEnumAll(p, tctx, &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", info_ctr.level);
+               status = dcerpc_srvsvc_NetShareEnumAll_r(b, 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++) {
+               if (info_ctr.level == 2 && r.out.info_ctr->ctr.ctr2) {
+                       for (j=0;j<r.out.info_ctr->ctr.ctr2->count;j++) {
                                const char *name;
-                               name = r.out.ctr.ctr2->array[j].name;
+                               name = r.out.info_ctr->ctr.ctr2->array[j].name;
                                if (!test_NetShareGetInfo(tctx, p, name, admin)) {
-                                       ret = False;
+                                       return false;
                                }
                        }
                }
        }
 
-       return ret;
+       return true;
 }
 
 static bool test_NetShareEnumAllFull(struct torture_context *tctx,
@@ -832,7 +845,13 @@ static bool test_NetShareEnum(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct srvsvc_NetShareEnum r;
+       struct srvsvc_NetShareInfoCtr info_ctr;
        struct srvsvc_NetShareCtr0 c0;
+       struct srvsvc_NetShareCtr1 c1;
+       struct srvsvc_NetShareCtr2 c2;
+       struct srvsvc_NetShareCtr501 c501;
+       struct srvsvc_NetShareCtr502 c502;
+       uint32_t totalentries = 0;
        struct {
                uint32_t level;
                WERROR anon_status;
@@ -845,40 +864,53 @@ static bool test_NetShareEnum(struct torture_context *tctx,
                 { 502, WERR_ACCESS_DENIED,     WERR_OK },
        };
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        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;
+       r.in.info_ctr = &info_ctr;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
+       r.out.totalentries = &totalentries;
+       r.out.info_ctr = &info_ctr;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                WERROR expected;
 
-               r.in.level = levels[i].level;
+               info_ctr.level = levels[i].level;
+
+               switch (info_ctr.level) {
+               case 0:
+                       ZERO_STRUCT(c0);
+                       info_ctr.ctr.ctr0 = &c0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(c1);
+                       info_ctr.ctr.ctr1 = &c1;
+                       break;
+               case 2:
+                       ZERO_STRUCT(c2);
+                       info_ctr.ctr.ctr2 = &c2;
+                       break;
+               case 501:
+                       ZERO_STRUCT(c501);
+                       info_ctr.ctr.ctr501 = &c501;
+                       break;
+               case 502:
+                       ZERO_STRUCT(c502);
+                       info_ctr.ctr.ctr502 = &c502;
+                       break;
+               }
+
                expected = levels[i].anon_status;
                if (admin) expected = levels[i].admin_status;
 
-               ZERO_STRUCT(r.out);
-
-               d_printf("testing NetShareEnum level %u\n", r.in.level);
-               status = dcerpc_srvsvc_NetShareEnum(p, tctx, &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", info_ctr.level);
+               status = dcerpc_srvsvc_NetShareEnum_r(b, 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,
@@ -897,140 +929,136 @@ static bool test_NetShareEnumAnon(struct torture_context *tctx,
 /* srvsvc_NetSrv          */
 /**************************/
 static bool test_NetSrvGetInfo(struct torture_context *tctx, 
-                                                          struct dcerpc_pipe *p)
+                              struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetSrvGetInfo r;
-       struct srvsvc_NetSrvInfo503 i503;
+       union srvsvc_NetSrvInfo info;
        uint32_t levels[] = {100, 101, 102, 502, 503};
        int i;
-       BOOL ret = True;
-       uint32_t resume_handle;
-
-       ZERO_STRUCT(i503);
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        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, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetSrvGetInfo level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
-               }
+               r.out.info = &info;
+               torture_comment(tctx, "Testing NetSrvGetInfo level %u\n", r.in.level);
+               status = dcerpc_srvsvc_NetSrvGetInfo_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetSrvGetInfo failed");
                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, "NetSrvGetInfo failed: %s\n", win_errstr(r.out.result));
                }
        }
 
-       return ret;
+       return true;
 }
 
 /**************************/
 /* srvsvc_NetDisk         */
 /**************************/
-static BOOL test_NetDiskEnum(struct torture_context *tctx, 
-                                                        struct dcerpc_pipe *p)
+static bool test_NetDiskEnum(struct torture_context *tctx, 
+                            struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetDiskEnum r;
+       struct srvsvc_NetDiskInfo info;
+       uint32_t totalentries = 0;
        uint32_t levels[] = {0};
        int i;
-       BOOL ret = True;
        uint32_t resume_handle=0;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(info);
 
-       ZERO_STRUCT(r.in);
        r.in.server_unc = NULL;
        r.in.resume_handle = &resume_handle;
+       r.in.info = &info;
+       r.out.info = &info;
+       r.out.totalentries = &totalentries;
+       r.out.resume_handle = &resume_handle;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
-               ZERO_STRUCT(r.out);
+               ZERO_STRUCTP(r.out.info);
                r.in.level = levels[i];
-               d_printf("testing NetDiskEnum level %u\n", r.in.level);
-               status = dcerpc_srvsvc_NetDiskEnum(p, tctx, &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_r(b, 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 torture_context *tctx, 
-                                                                 struct dcerpc_pipe *p)
+                                 struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetTransportEnum r;
-       struct srvsvc_NetTransportCtr0 c0;
+       struct srvsvc_NetTransportInfoCtr transports;
+       struct srvsvc_NetTransportCtr0 ctr0;
+       struct srvsvc_NetTransportCtr1 ctr1;
+
+       uint32_t totalentries = 0;
        uint32_t levels[] = {0, 1};
        int i;
-       BOOL ret = True;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       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;
+       ZERO_STRUCT(transports);
+
+       r.in.server_unc = talloc_asprintf(tctx,"\\\\%s", dcerpc_server_name(p));
+       r.in.transports = &transports;
        r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
+       r.out.totalentries = &totalentries;
+       r.out.transports = &transports;
 
        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, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("NetTransportEnum level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
-                       continue;
+               transports.level = levels[i];
+               switch (transports.level) {
+               case 0:
+                       ZERO_STRUCT(ctr0);
+                       transports.ctr.ctr0 = &ctr0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(ctr1);
+                       transports.ctr.ctr1 = &ctr1;
+                       break;
                }
+               torture_comment(tctx, "Testing NetTransportEnum level %u\n", transports.level);
+               status = dcerpc_srvsvc_NetTransportEnum_r(b, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "NetTransportEnum failed");
                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, "unexpected result: %s\n", win_errstr(r.out.result));
                }
        }
 
-       return ret;
+       return true;
 }
 
 /**************************/
 /* srvsvc_NetRemoteTOD    */
 /**************************/
-static BOOL test_NetRemoteTOD(struct torture_context *tctx, 
-                                                         struct dcerpc_pipe *p)
+static bool test_NetRemoteTOD(struct torture_context *tctx, 
+                             struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct srvsvc_NetRemoteTOD r;
-       BOOL ret = True;
+       struct srvsvc_NetRemoteTODInfo *info = NULL;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
+       r.out.info = &info;
 
-       ZERO_STRUCT(r.out);
-       d_printf("testing NetRemoteTOD\n");
-       status = dcerpc_srvsvc_NetRemoteTOD(p, tctx, &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_r(b, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status, "NetRemoteTOD failed");
+       torture_assert_werr_ok(tctx, r.out.result, "NetRemoteTOD failed");
 
-       return ret;
+       return true;
 }
 
 /**************************/
@@ -1045,11 +1073,12 @@ static bool test_NetNameValidate(struct torture_context *tctx,
        char *invalidc;
        char *name;
        int i, n, min, max;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.flags = 0x0;
 
-       d_printf("testing NetNameValidate\n");
+       d_printf("Testing NetNameValidate\n");
 
        /* valid path types only between 1 and 13 */
        for (i = 1; i < 14; i++) {
@@ -1069,7 +1098,7 @@ again:
                        memset(name, 'A', n);
                        name[n] = '\0';
 
-                       status = dcerpc_srvsvc_NetNameValidate(p, tctx, &r);
+                       status = dcerpc_srvsvc_NetNameValidate_r(b, tctx, &r);
                        if (!NT_STATUS_IS_OK(status)) {
                                d_printf("NetNameValidate failed while checking maximum size (%s)\n",
                                                nt_errstr(status));
@@ -1101,7 +1130,7 @@ again:
                for (n = 0x20; n < 0x7e; n++) {
                        r.in.name = name = talloc_asprintf(tctx, "%c", (char)n);
 
-                       status = dcerpc_srvsvc_NetNameValidate(p, tctx, &r);
+                       status = dcerpc_srvsvc_NetNameValidate_r(b, tctx, &r);
                        if (!NT_STATUS_IS_OK(status)) {
                                d_printf("NetNameValidate failed while checking valid chars (%s)\n",
                                                nt_errstr(status));
@@ -1109,7 +1138,7 @@ again:
                        }
 
                        if (!W_ERROR_IS_OK(r.out.result)) {
-                               invalidc = talloc_asprintf_append(invalidc, "%c", (char)n);
+                               invalidc = talloc_asprintf_append_buffer(invalidc, "%c", (char)n);
                        }
 
                        talloc_free(name);
@@ -1126,13 +1155,14 @@ again:
                r.in.flags = 0x0;
        }
 
-       return True;
+       return true;
 }
 
 struct torture_suite *torture_rpc_srvsvc(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, "SRVSVC");
-       struct torture_tcase *tcase;
+       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);
 
@@ -1148,8 +1178,9 @@ struct torture_suite *torture_rpc_srvsvc(TALLOC_CTX *mem_ctx)
        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);
-       torture_rpc_tcase_add_test(tcase, "NetShareAddSetDel", 
-                                                          test_NetShareAddSetDel);
+       test = torture_rpc_tcase_add_test(tcase, "NetShareAddSetDel", 
+                                          test_NetShareAddSetDel);
+       test->dangerous = true;
        torture_rpc_tcase_add_test(tcase, "NetNameValidate", test_NetNameValidate);
        
        tcase = torture_suite_add_anon_rpc_iface_tcase(suite,