s4-torture: LookupSids3 is only available over NCACN_IP_TCP.
[kai/samba.git] / source4 / torture / rpc / lsa.c
index 7305a31960465ac1d9b9179d9a0302822c1ce9c7..f420ec183386105990ec5c64d7b6663654bf7388 100644 (file)
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "lib/events/events.h"
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
 #include "param/param.h"
 #include "../lib/crypto/crypto.h"
 #define TEST_MACHINENAME "lsatestmach"
+#define TRUSTPW "12345678"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
        name->string = s;
 }
 
-static bool test_OpenPolicy(struct dcerpc_pipe *p,
+static bool test_OpenPolicy(struct dcerpc_binding_handle *b,
                            struct torture_context *tctx)
 {
        struct lsa_ObjectAttribute attr;
        struct policy_handle handle;
        struct lsa_QosInfo qos;
        struct lsa_OpenPolicy r;
-       NTSTATUS status;
        uint16_t system_name = '\\';
 
        torture_comment(tctx, "\nTesting OpenPolicy\n");
@@ -66,14 +67,17 @@ static bool test_OpenPolicy(struct dcerpc_pipe *p,
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = &handle;
 
-       status = dcerpc_lsa_OpenPolicy(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-                   NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
-                       torture_comment(tctx, "not considering %s to be an error\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenPolicy_r(b, tctx, &r),
+                                  "OpenPolicy failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_ACCESS_DENIED) ||
+                   NT_STATUS_EQUAL(r.out.result, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
+                       torture_comment(tctx, "not considering %s to be an error\n",
+                                       nt_errstr(r.out.result));
                        return true;
                }
-               torture_comment(tctx, "OpenPolicy failed - %s\n", nt_errstr(status));
+               torture_comment(tctx, "OpenPolicy failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -81,9 +85,10 @@ static bool test_OpenPolicy(struct dcerpc_pipe *p,
 }
 
 
-bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p,
-                         struct torture_context *tctx,
-                         struct policy_handle **handle)
+bool test_lsa_OpenPolicy2_ex(struct dcerpc_binding_handle *b,
+                            struct torture_context *tctx,
+                            struct policy_handle **handle,
+                            NTSTATUS expected_status)
 {
        struct lsa_ObjectAttribute attr;
        struct lsa_QosInfo qos;
@@ -114,16 +119,23 @@ bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p,
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = *handle;
 
-       status = dcerpc_lsa_OpenPolicy2(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-                   NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
-                       torture_comment(tctx, "not considering %s to be an error\n", nt_errstr(status));
+       status = dcerpc_lsa_OpenPolicy2_r(b, tctx, &r);
+       torture_assert_ntstatus_equal(tctx, status, expected_status,
+                                  "OpenPolicy2 failed");
+       if (!NT_STATUS_IS_OK(expected_status)) {
+               return true;
+       }
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_ACCESS_DENIED) ||
+                   NT_STATUS_EQUAL(r.out.result, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
+                       torture_comment(tctx, "not considering %s to be an error\n",
+                                       nt_errstr(r.out.result));
                        talloc_free(*handle);
                        *handle = NULL;
                        return true;
                }
-               torture_comment(tctx, "OpenPolicy2 failed - %s\n", nt_errstr(status));
+               torture_comment(tctx, "OpenPolicy2 failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -131,24 +143,14 @@ bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p,
 }
 
 
-static const char *sid_type_lookup(enum lsa_SidType r)
+bool test_lsa_OpenPolicy2(struct dcerpc_binding_handle *b,
+                         struct torture_context *tctx,
+                         struct policy_handle **handle)
 {
-       switch (r) {
-               case SID_NAME_USE_NONE: return "SID_NAME_USE_NONE"; break;
-               case SID_NAME_USER: return "SID_NAME_USER"; break;
-               case SID_NAME_DOM_GRP: return "SID_NAME_DOM_GRP"; break;
-               case SID_NAME_DOMAIN: return "SID_NAME_DOMAIN"; break;
-               case SID_NAME_ALIAS: return "SID_NAME_ALIAS"; break;
-               case SID_NAME_WKN_GRP: return "SID_NAME_WKN_GRP"; break;
-               case SID_NAME_DELETED: return "SID_NAME_DELETED"; break;
-               case SID_NAME_INVALID: return "SID_NAME_INVALID"; break;
-               case SID_NAME_UNKNOWN: return "SID_NAME_UNKNOWN"; break;
-               case SID_NAME_COMPUTER: return "SID_NAME_COMPUTER"; break;
-       }
-       return "Invalid sid type\n";
+       return test_lsa_OpenPolicy2_ex(b, tctx, handle, NT_STATUS_OK);
 }
 
-static bool test_LookupNames(struct dcerpc_pipe *p,
+static bool test_LookupNames(struct dcerpc_binding_handle *b,
                             struct torture_context *tctx,
                             struct policy_handle *handle,
                             struct lsa_TransNameArray *tnames)
@@ -158,21 +160,29 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
        struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
-       NTSTATUS status;
        int i;
+       uint32_t *input_idx;
 
        torture_comment(tctx, "\nTesting LookupNames with %d names\n", tnames->count);
 
        sids.count = 0;
        sids.sids = NULL;
 
+
+       r.in.num_names = 0;
+
+       input_idx = talloc_array(tctx, uint32_t, tnames->count);
        names = talloc_array(tctx, struct lsa_String, tnames->count);
+
        for (i=0;i<tnames->count;i++) {
-               init_lsa_String(&names[i], tnames->names[i].name.string);
+               if (tnames->names[i].sid_type != SID_NAME_UNKNOWN) {
+                       init_lsa_String(&names[r.in.num_names], tnames->names[i].name.string);
+                       input_idx[r.in.num_names] = i;
+                       r.in.num_names++;
+               }
        }
 
        r.in.handle = handle;
-       r.in.num_names = tnames->count;
        r.in.names = names;
        r.in.sids = &sids;
        r.in.level = 1;
@@ -181,11 +191,11 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
        r.out.sids = &sids;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames(p, tctx, &r);
-
-       if (NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
-           NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
-               for (i=0;i< tnames->count;i++) {
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupNames_r(b, tctx, &r),
+                                  "LookupNames failed");
+       if (NT_STATUS_EQUAL(r.out.result, STATUS_SOME_UNMAPPED) ||
+           NT_STATUS_EQUAL(r.out.result, NT_STATUS_NONE_MAPPED)) {
+               for (i=0;i< r.in.num_names;i++) {
                        if (i < count && sids.sids[i].sid_type == SID_NAME_UNKNOWN) {
                                torture_comment(tctx, "LookupName of %s was unmapped\n",
                                       tnames->names[i].name.string);
@@ -194,29 +204,32 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
                                       tnames->names[i].name.string);
                        }
                }
-               torture_comment(tctx, "LookupNames failed - %s\n", nt_errstr(status));
+               torture_comment(tctx, "LookupNames failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
-       } else if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupNames failed - %s\n", nt_errstr(status));
+       } else if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "LookupNames failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
-       for (i=0;i< tnames->count;i++) {
+       for (i=0;i< r.in.num_names;i++) {
                if (i < count) {
-                       if (sids.sids[i].sid_type != tnames->names[i].sid_type) {
+                       if (sids.sids[i].sid_type != tnames->names[input_idx[i]].sid_type) {
                                torture_comment(tctx, "LookupName of %s got unexpected name type: %s\n",
-                                      tnames->names[i].name.string, sid_type_lookup(sids.sids[i].sid_type));
+                                               tnames->names[input_idx[i]].name.string,
+                                               sid_type_lookup(sids.sids[i].sid_type));
                                return false;
                        }
                        if ((sids.sids[i].sid_type == SID_NAME_DOMAIN) &&
                            (sids.sids[i].rid != (uint32_t)-1)) {
                                torture_comment(tctx, "LookupName of %s got unexpected rid: %d\n",
-                                       tnames->names[i].name.string, sids.sids[i].rid);
+                                       tnames->names[input_idx[i]].name.string, sids.sids[i].rid);
                                return false;
                        }
                } else if (i >=count) {
                        torture_comment(tctx, "LookupName of %s failed to return a result\n",
-                              tnames->names[i].name.string);
+                              tnames->names[input_idx[i]].name.string);
                        return false;
                }
        }
@@ -225,38 +238,25 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_LookupNames_bogus(struct dcerpc_pipe *p,
+static bool test_LookupNames_bogus(struct dcerpc_binding_handle *b,
                                   struct torture_context *tctx,
                                   struct policy_handle *handle)
 {
        struct lsa_LookupNames r;
        struct lsa_TransSidArray sids;
        struct lsa_RefDomainList *domains = NULL;
-       struct lsa_String *names;
+       struct lsa_String names[1];
        uint32_t count = 0;
-       NTSTATUS status;
-       int i;
-
-       struct lsa_TranslatedName name[2];
-       struct lsa_TransNameArray tnames;
 
-       tnames.names = name;
-       tnames.count = 2;
-       name[0].name.string = "NT AUTHORITY\\BOGUS";
-       name[1].name.string = NULL;
-
-       torture_comment(tctx, "\nTesting LookupNames with bogus names\n");
+       torture_comment(tctx, "\nTesting LookupNames with bogus name\n");
 
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc_array(tctx, struct lsa_String, tnames.count);
-       for (i=0;i<tnames.count;i++) {
-               init_lsa_String(&names[i], tnames.names[i].name.string);
-       }
+       init_lsa_String(&names[0], "NT AUTHORITY\\BOGUS");
 
        r.in.handle = handle;
-       r.in.num_names = tnames.count;
+       r.in.num_names = 1;
        r.in.names = names;
        r.in.sids = &sids;
        r.in.level = 1;
@@ -265,9 +265,11 @@ static bool test_LookupNames_bogus(struct dcerpc_pipe *p,
        r.out.sids = &sids;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames(p, tctx, &r);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
-               torture_comment(tctx, "LookupNames failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupNames_r(b, tctx, &r),
+                                  "LookupNames bogus failed");
+       if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_NONE_MAPPED)) {
+               torture_comment(tctx, "LookupNames failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -276,7 +278,51 @@ static bool test_LookupNames_bogus(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_LookupNames_wellknown(struct dcerpc_pipe *p,
+static bool test_LookupNames_NULL(struct dcerpc_binding_handle *b,
+                                 struct torture_context *tctx,
+                                 struct policy_handle *handle)
+{
+       struct lsa_LookupNames r;
+       struct lsa_TransSidArray sids;
+       struct lsa_RefDomainList *domains = NULL;
+       struct lsa_String names[1];
+       uint32_t count = 0;
+
+       torture_comment(tctx, "\nTesting LookupNames with NULL name\n");
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names[0].string = NULL;
+
+       r.in.handle = handle;
+       r.in.num_names = 1;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.out.count = &count;
+       r.out.sids = &sids;
+       r.out.domains = &domains;
+
+       /* nt4 returns NT_STATUS_NONE_MAPPED with sid_type
+        * SID_NAME_UNKNOWN, rid 0, and sid_index -1;
+        *
+        * w2k3/w2k8 return NT_STATUS_OK with sid_type
+        * SID_NAME_DOMAIN, rid -1 and sid_index 0 and BUILTIN domain
+        */
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupNames_r(b, tctx, &r),
+               "LookupNames with NULL name failed");
+       torture_assert_ntstatus_ok(tctx, r.out.result,
+               "LookupNames with NULL name failed");
+
+       torture_comment(tctx, "\n");
+
+       return true;
+}
+
+static bool test_LookupNames_wellknown(struct dcerpc_binding_handle *b,
                                       struct torture_context *tctx,
                                       struct policy_handle *handle)
 {
@@ -290,43 +336,43 @@ static bool test_LookupNames_wellknown(struct dcerpc_pipe *p,
        tnames.count = 1;
        name.name.string = "NT AUTHORITY\\SYSTEM";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
        name.name.string = "NT AUTHORITY\\ANONYMOUS LOGON";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
        name.name.string = "NT AUTHORITY\\Authenticated Users";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
 #if 0
        name.name.string = "NT AUTHORITY";
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
        name.name.string = "NT AUTHORITY\\";
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 #endif
 
        name.name.string = "BUILTIN\\";
        name.sid_type = SID_NAME_DOMAIN;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
        name.name.string = "BUILTIN\\Administrators";
        name.sid_type = SID_NAME_ALIAS;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
        name.name.string = "SYSTEM";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
        name.name.string = "Everyone";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, tctx, handle, &tnames);
+       ret &= test_LookupNames(b, tctx, handle, &tnames);
        return ret;
 }
 
-static bool test_LookupNames2(struct dcerpc_pipe *p,
+static bool test_LookupNames2(struct dcerpc_binding_handle *b,
                              struct torture_context *tctx,
                              struct policy_handle *handle,
                              struct lsa_TransNameArray2 *tnames,
@@ -337,21 +383,28 @@ static bool test_LookupNames2(struct dcerpc_pipe *p,
        struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
-       NTSTATUS status;
        int i;
 
        torture_comment(tctx, "\nTesting LookupNames2 with %d names\n", tnames->count);
 
        sids.count = 0;
        sids.sids = NULL;
+       uint32_t *input_idx;
 
+       r.in.num_names = 0;
+
+       input_idx = talloc_array(tctx, uint32_t, tnames->count);
        names = talloc_array(tctx, struct lsa_String, tnames->count);
+
        for (i=0;i<tnames->count;i++) {
-               init_lsa_String(&names[i], tnames->names[i].name.string);
+               if (tnames->names[i].sid_type != SID_NAME_UNKNOWN) {
+                       init_lsa_String(&names[r.in.num_names], tnames->names[i].name.string);
+                       input_idx[r.in.num_names] = i;
+                       r.in.num_names++;
+               }
        }
 
        r.in.handle = handle;
-       r.in.num_names = tnames->count;
        r.in.names = names;
        r.in.sids = &sids;
        r.in.level = 1;
@@ -362,9 +415,11 @@ static bool test_LookupNames2(struct dcerpc_pipe *p,
        r.out.sids = &sids;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames2(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupNames2 failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupNames2_r(b, tctx, &r),
+               "LookupNames2 failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "LookupNames2 failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -382,7 +437,7 @@ static bool test_LookupNames2(struct dcerpc_pipe *p,
 }
 
 
-static bool test_LookupNames3(struct dcerpc_pipe *p,
+static bool test_LookupNames3(struct dcerpc_binding_handle *b,
                              struct torture_context *tctx,
                              struct policy_handle *handle,
                              struct lsa_TransNameArray2 *tnames,
@@ -393,21 +448,27 @@ static bool test_LookupNames3(struct dcerpc_pipe *p,
        struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
-       NTSTATUS status;
        int i;
+       uint32_t *input_idx;
 
        torture_comment(tctx, "\nTesting LookupNames3 with %d names\n", tnames->count);
 
        sids.count = 0;
        sids.sids = NULL;
 
+       r.in.num_names = 0;
+
+       input_idx = talloc_array(tctx, uint32_t, tnames->count);
        names = talloc_array(tctx, struct lsa_String, tnames->count);
        for (i=0;i<tnames->count;i++) {
-               init_lsa_String(&names[i], tnames->names[i].name.string);
+               if (tnames->names[i].sid_type != SID_NAME_UNKNOWN) {
+                       init_lsa_String(&names[r.in.num_names], tnames->names[i].name.string);
+                       input_idx[r.in.num_names] = i;
+                       r.in.num_names++;
+               }
        }
 
        r.in.handle = handle;
-       r.in.num_names = tnames->count;
        r.in.names = names;
        r.in.sids = &sids;
        r.in.level = 1;
@@ -418,9 +479,11 @@ static bool test_LookupNames3(struct dcerpc_pipe *p,
        r.out.sids = &sids;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames3(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupNames3 failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupNames3_r(b, tctx, &r),
+               "LookupNames3 failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "LookupNames3 failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -437,7 +500,7 @@ static bool test_LookupNames3(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_LookupNames4(struct dcerpc_pipe *p,
+static bool test_LookupNames4(struct dcerpc_binding_handle *b,
                              struct torture_context *tctx,
                              struct lsa_TransNameArray2 *tnames,
                              bool check_result)
@@ -447,17 +510,24 @@ static bool test_LookupNames4(struct dcerpc_pipe *p,
        struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
-       NTSTATUS status;
        int i;
+       uint32_t *input_idx;
 
        torture_comment(tctx, "\nTesting LookupNames4 with %d names\n", tnames->count);
 
        sids.count = 0;
        sids.sids = NULL;
 
+       r.in.num_names = 0;
+
+       input_idx = talloc_array(tctx, uint32_t, tnames->count);
        names = talloc_array(tctx, struct lsa_String, tnames->count);
        for (i=0;i<tnames->count;i++) {
-               init_lsa_String(&names[i], tnames->names[i].name.string);
+               if (tnames->names[i].sid_type != SID_NAME_UNKNOWN) {
+                       init_lsa_String(&names[r.in.num_names], tnames->names[i].name.string);
+                       input_idx[r.in.num_names] = i;
+                       r.in.num_names++;
+               }
        }
 
        r.in.num_names = tnames->count;
@@ -471,9 +541,11 @@ static bool test_LookupNames4(struct dcerpc_pipe *p,
        r.out.sids = &sids;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames4(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupNames4 failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupNames4_r(b, tctx, &r),
+               "LookupNames4 failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "LookupNames4 failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -491,7 +563,7 @@ static bool test_LookupNames4(struct dcerpc_pipe *p,
 }
 
 
-static bool test_LookupSids(struct dcerpc_pipe *p,
+static bool test_LookupSids(struct dcerpc_binding_handle *b,
                            struct torture_context *tctx,
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
@@ -500,7 +572,6 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
        struct lsa_TransNameArray names;
        struct lsa_RefDomainList *domains = NULL;
        uint32_t count = sids->num_sids;
-       NTSTATUS status;
 
        torture_comment(tctx, "\nTesting LookupSids\n");
 
@@ -516,15 +587,18 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
        r.out.names = &names;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupSids(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupSids failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupSids_r(b, tctx, &r),
+               "LookupSids failed");
+       if (!NT_STATUS_IS_OK(r.out.result) &&
+           !NT_STATUS_EQUAL(r.out.result, STATUS_SOME_UNMAPPED)) {
+               torture_comment(tctx, "LookupSids failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
        torture_comment(tctx, "\n");
 
-       if (!test_LookupNames(p, tctx, handle, &names)) {
+       if (!test_LookupNames(b, tctx, handle, &names)) {
                return false;
        }
 
@@ -532,7 +606,7 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
 }
 
 
-static bool test_LookupSids2(struct dcerpc_pipe *p,
+static bool test_LookupSids2(struct dcerpc_binding_handle *b,
                            struct torture_context *tctx,
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
@@ -541,7 +615,6 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
        struct lsa_TransNameArray2 names;
        struct lsa_RefDomainList *domains = NULL;
        uint32_t count = sids->num_sids;
-       NTSTATUS status;
 
        torture_comment(tctx, "\nTesting LookupSids2\n");
 
@@ -559,26 +632,29 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
        r.out.names = &names;
        r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupSids2(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupSids2 failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupSids2_r(b, tctx, &r),
+               "LookupSids2 failed");
+       if (!NT_STATUS_IS_OK(r.out.result) &&
+           !NT_STATUS_EQUAL(r.out.result, STATUS_SOME_UNMAPPED)) {
+               torture_comment(tctx, "LookupSids2 failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
        torture_comment(tctx, "\n");
 
-       if (!test_LookupNames2(p, tctx, handle, &names, false)) {
+       if (!test_LookupNames2(b, tctx, handle, &names, false)) {
                return false;
        }
 
-       if (!test_LookupNames3(p, tctx, handle, &names, false)) {
+       if (!test_LookupNames3(b, tctx, handle, &names, false)) {
                return false;
        }
 
        return true;
 }
 
-static bool test_LookupSids3(struct dcerpc_pipe *p,
+static bool test_LookupSids3(struct dcerpc_binding_handle *b,
                            struct torture_context *tctx,
                            struct lsa_SidArray *sids)
 {
@@ -586,7 +662,6 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
        struct lsa_TransNameArray2 names;
        struct lsa_RefDomainList *domains = NULL;
        uint32_t count = sids->num_sids;
-       NTSTATUS status;
 
        torture_comment(tctx, "\nTesting LookupSids3\n");
 
@@ -603,21 +678,23 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
        r.out.count = &count;
        r.out.names = &names;
 
-       status = dcerpc_lsa_LookupSids3(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-                   NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
-                       torture_comment(tctx, "not considering %s to be an error\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupSids3_r(b, tctx, &r),
+               "LookupSids3 failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_ACCESS_DENIED) ||
+                   NT_STATUS_EQUAL(r.out.result, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
+                       torture_comment(tctx, "not considering %s to be an error\n",
+                                       nt_errstr(r.out.result));
                        return true;
                }
                torture_comment(tctx, "LookupSids3 failed - %s - not considered an error\n",
-                      nt_errstr(status));
+                               nt_errstr(r.out.result));
                return false;
        }
 
        torture_comment(tctx, "\n");
 
-       if (!test_LookupNames4(p, tctx, &names, false)) {
+       if (!test_LookupNames4(b, tctx, &names, false)) {
                return false;
        }
 
@@ -629,9 +706,9 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                          struct policy_handle *handle)
 {
        uint32_t count;
-       NTSTATUS status;
        struct lsa_SidArray sids;
        int i;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        torture_comment(tctx, "\nTesting LookupSids with lots of SIDs\n");
 
@@ -662,19 +739,22 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                r.out.names = &names;
                r.out.domains = &domains;
 
-               status = dcerpc_lsa_LookupSids(p, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "LookupSids failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupSids_r(b, tctx, &r),
+                       "LookupSids failed");
+               if (!NT_STATUS_IS_OK(r.out.result)) {
+                       torture_comment(tctx, "LookupSids failed - %s\n",
+                                       nt_errstr(r.out.result));
                        return false;
                }
 
                torture_comment(tctx, "\n");
 
-               if (!test_LookupNames(p, tctx, handle, &names)) {
+               if (!test_LookupNames(b, tctx, handle, &names)) {
                        return false;
                }
        } else if (p->conn->security_state.auth_info->auth_type == DCERPC_AUTH_TYPE_SCHANNEL &&
-                  p->conn->security_state.auth_info->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY) {
+                  p->conn->security_state.auth_info->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY &&
+                  (p->binding->transport == NCACN_IP_TCP || p->binding->transport == NCALRPC)) {
                struct lsa_LookupSids3 r;
                struct lsa_RefDomainList *domains = NULL;
                struct lsa_TransNameArray2 names;
@@ -694,18 +774,20 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                r.out.names = &names;
                r.out.domains = &domains;
 
-               status = dcerpc_lsa_LookupSids3(p, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-                           NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
-                               torture_comment(tctx, "not considering %s to be an error\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupSids3_r(b, tctx, &r),
+                       "LookupSids3 failed");
+               if (!NT_STATUS_IS_OK(r.out.result)) {
+                       if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_ACCESS_DENIED) ||
+                           NT_STATUS_EQUAL(r.out.result, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
+                               torture_comment(tctx, "not considering %s to be an error\n",
+                                               nt_errstr(r.out.result));
                                return true;
                        }
                        torture_comment(tctx, "LookupSids3 failed - %s\n",
-                              nt_errstr(status));
+                                       nt_errstr(r.out.result));
                        return false;
                }
-               if (!test_LookupNames4(p, tctx, &names, false)) {
+               if (!test_LookupNames4(b, tctx, &names, false)) {
                        return false;
                }
        }
@@ -717,12 +799,13 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
        return true;
 }
 
-static void lookupsids_cb(struct rpc_request *req)
+static void lookupsids_cb(struct tevent_req *subreq)
 {
-       int *replies = (int *)req->async.private_data;
+       int *replies = (int *)tevent_req_callback_data_void(subreq);
        NTSTATUS status;
 
-       status = dcerpc_ndr_request_recv(req);
+       status = dcerpc_lsa_LookupSids_r_recv(subreq, subreq);
+       TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
                printf("lookupsids returned %s\n", nt_errstr(status));
                *replies = -1;
@@ -733,7 +816,7 @@ static void lookupsids_cb(struct rpc_request *req)
        }
 }
 
-static bool test_LookupSids_async(struct dcerpc_pipe *p,
+static bool test_LookupSids_async(struct dcerpc_binding_handle *b,
                                  struct torture_context *tctx,
                                  struct policy_handle *handle)
 {
@@ -743,7 +826,7 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
        struct lsa_TransNameArray *names;
        struct lsa_LookupSids *r;
        struct lsa_RefDomainList *domains = NULL;
-       struct rpc_request **req;
+       struct tevent_req **req;
        int i, replies;
        bool ret = true;
        const int num_async_requests = 50;
@@ -754,7 +837,7 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
 
        torture_comment(tctx, "\nTesting %d async lookupsids request\n", num_async_requests);
 
-       req = talloc_array(tctx, struct rpc_request *, num_async_requests);
+       req = talloc_array(tctx, struct tevent_req *, num_async_requests);
 
        sids.num_sids = 1;
        sids.sids = &sidptr;
@@ -776,18 +859,17 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
                r[i].out.names = &names[i];
                r[i].out.domains = &domains;
 
-               req[i] = dcerpc_lsa_LookupSids_send(p, req, &r[i]);
+               req[i] = dcerpc_lsa_LookupSids_r_send(tctx, tctx->ev, b, &r[i]);
                if (req[i] == NULL) {
                        ret = false;
                        break;
                }
 
-               req[i]->async.callback = lookupsids_cb;
-               req[i]->async.private_data = &replies;
+               tevent_req_set_callback(req[i], lookupsids_cb, &replies);
        }
 
        while (replies >= 0 && replies < num_async_requests) {
-               event_loop_once(p->conn->event_ctx);
+               tevent_loop_once(tctx->ev);
        }
 
        talloc_free(req);
@@ -799,12 +881,11 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
        return ret;
 }
 
-static bool test_LookupPrivValue(struct dcerpc_pipe *p,
+static bool test_LookupPrivValue(struct dcerpc_binding_handle *b,
                                 struct torture_context *tctx,
                                 struct policy_handle *handle,
                                 struct lsa_String *name)
 {
-       NTSTATUS status;
        struct lsa_LookupPrivValue r;
        struct lsa_LUID luid;
 
@@ -812,21 +893,22 @@ static bool test_LookupPrivValue(struct dcerpc_pipe *p,
        r.in.name = name;
        r.out.luid = &luid;
 
-       status = dcerpc_lsa_LookupPrivValue(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "\nLookupPrivValue failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupPrivValue_r(b, tctx, &r),
+               "LookupPrivValue failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "\nLookupPrivValue failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
        return true;
 }
 
-static bool test_LookupPrivName(struct dcerpc_pipe *p,
+static bool test_LookupPrivName(struct dcerpc_binding_handle *b,
                                struct torture_context *tctx,
                                struct policy_handle *handle,
                                struct lsa_LUID *luid)
 {
-       NTSTATUS status;
        struct lsa_LookupPrivName r;
        struct lsa_StringLarge *name = NULL;
 
@@ -834,22 +916,23 @@ static bool test_LookupPrivName(struct dcerpc_pipe *p,
        r.in.luid = luid;
        r.out.name = &name;
 
-       status = dcerpc_lsa_LookupPrivName(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "\nLookupPrivName failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupPrivName_r(b, tctx, &r),
+               "LookupPrivName failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "\nLookupPrivName failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
        return true;
 }
 
-static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
+static bool test_RemovePrivilegesFromAccount(struct dcerpc_binding_handle *b,
                                             struct torture_context *tctx,
                                             struct policy_handle *handle,
                                             struct policy_handle *acct_handle,
                                             struct lsa_LUID *luid)
 {
-       NTSTATUS status;
        struct lsa_RemovePrivilegesFromAccount r;
        struct lsa_PrivilegeSet privs;
        bool ret = true;
@@ -866,8 +949,9 @@ static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
        privs.set[0].luid = *luid;
        privs.set[0].attribute = 0;
 
-       status = dcerpc_lsa_RemovePrivilegesFromAccount(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_RemovePrivilegesFromAccount_r(b, tctx, &r),
+               "RemovePrivilegesFromAccount failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
 
                struct lsa_LookupPrivName r_name;
                struct lsa_StringLarge *name = NULL;
@@ -876,9 +960,11 @@ static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
                r_name.in.luid = luid;
                r_name.out.name = &name;
 
-               status = dcerpc_lsa_LookupPrivName(p, tctx, &r_name);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "\nLookupPrivName failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupPrivName_r(b, tctx, &r_name),
+                       "LookupPrivName failed");
+               if (!NT_STATUS_IS_OK(r_name.out.result)) {
+                       torture_comment(tctx, "\nLookupPrivName failed - %s\n",
+                                       nt_errstr(r_name.out.result));
                        return false;
                }
                /* Windows 2008 does not allow this to be removed */
@@ -888,19 +974,18 @@ static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "RemovePrivilegesFromAccount failed to remove %s - %s\n",
                       name->string,
-                      nt_errstr(status));
+                      nt_errstr(r.out.result));
                return false;
        }
 
        return ret;
 }
 
-static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p,
+static bool test_AddPrivilegesToAccount(struct dcerpc_binding_handle *b,
                                        struct torture_context *tctx,
                                        struct policy_handle *acct_handle,
                                        struct lsa_LUID *luid)
 {
-       NTSTATUS status;
        struct lsa_AddPrivilegesToAccount r;
        struct lsa_PrivilegeSet privs;
        bool ret = true;
@@ -916,21 +1001,22 @@ static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p,
        privs.set[0].luid = *luid;
        privs.set[0].attribute = 0;
 
-       status = dcerpc_lsa_AddPrivilegesToAccount(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "AddPrivilegesToAccount failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_AddPrivilegesToAccount_r(b, tctx, &r),
+               "AddPrivilegesToAccount failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "AddPrivilegesToAccount failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
        return ret;
 }
 
-static bool test_EnumPrivsAccount(struct dcerpc_pipe *p,
+static bool test_EnumPrivsAccount(struct dcerpc_binding_handle *b,
                                  struct torture_context *tctx,
                                  struct policy_handle *handle,
                                  struct policy_handle *acct_handle)
 {
-       NTSTATUS status;
        struct lsa_EnumPrivsAccount r;
        struct lsa_PrivilegeSet *privs = NULL;
        bool ret = true;
@@ -940,34 +1026,35 @@ static bool test_EnumPrivsAccount(struct dcerpc_pipe *p,
        r.in.handle = acct_handle;
        r.out.privs = &privs;
 
-       status = dcerpc_lsa_EnumPrivsAccount(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "EnumPrivsAccount failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumPrivsAccount_r(b, tctx, &r),
+               "EnumPrivsAccount failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "EnumPrivsAccount failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
        if (privs && privs->count > 0) {
                int i;
                for (i=0;i<privs->count;i++) {
-                       test_LookupPrivName(p, tctx, handle,
+                       test_LookupPrivName(b, tctx, handle,
                                            &privs->set[i].luid);
                }
 
-               ret &= test_RemovePrivilegesFromAccount(p, tctx, handle, acct_handle,
+               ret &= test_RemovePrivilegesFromAccount(b, tctx, handle, acct_handle,
                                                        &privs->set[0].luid);
-               ret &= test_AddPrivilegesToAccount(p, tctx, acct_handle,
+               ret &= test_AddPrivilegesToAccount(b, tctx, acct_handle,
                                                   &privs->set[0].luid);
        }
 
        return ret;
 }
 
-static bool test_GetSystemAccessAccount(struct dcerpc_pipe *p,
+static bool test_GetSystemAccessAccount(struct dcerpc_binding_handle *b,
                                        struct torture_context *tctx,
                                        struct policy_handle *handle,
                                        struct policy_handle *acct_handle)
 {
-       NTSTATUS status;
        uint32_t access_mask;
        struct lsa_GetSystemAccessAccount r;
 
@@ -976,9 +1063,11 @@ static bool test_GetSystemAccessAccount(struct dcerpc_pipe *p,
        r.in.handle = acct_handle;
        r.out.access_mask = &access_mask;
 
-       status = dcerpc_lsa_GetSystemAccessAccount(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "GetSystemAccessAccount failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_GetSystemAccessAccount_r(b, tctx, &r),
+               "GetSystemAccessAccount failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "GetSystemAccessAccount failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -1016,39 +1105,40 @@ static bool test_GetSystemAccessAccount(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_Delete(struct dcerpc_pipe *p,
+static bool test_Delete(struct dcerpc_binding_handle *b,
                        struct torture_context *tctx,
                        struct policy_handle *handle)
 {
-       NTSTATUS status;
        struct lsa_Delete r;
 
        torture_comment(tctx, "\nTesting Delete\n");
 
        r.in.handle = handle;
-       status = dcerpc_lsa_Delete(p, tctx, &r);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-               torture_comment(tctx, "Delete should have failed NT_STATUS_NOT_SUPPORTED - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_Delete_r(b, tctx, &r),
+               "Delete failed");
+       if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_NOT_SUPPORTED)) {
+               torture_comment(tctx, "Delete should have failed NT_STATUS_NOT_SUPPORTED - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
        return true;
 }
 
-static bool test_DeleteObject(struct dcerpc_pipe *p,
+static bool test_DeleteObject(struct dcerpc_binding_handle *b,
                              struct torture_context *tctx,
                              struct policy_handle *handle)
 {
-       NTSTATUS status;
        struct lsa_DeleteObject r;
 
        torture_comment(tctx, "\nTesting DeleteObject\n");
 
        r.in.handle = handle;
        r.out.handle = handle;
-       status = dcerpc_lsa_DeleteObject(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "DeleteObject failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_DeleteObject_r(b, tctx, &r),
+               "DeleteObject failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "DeleteObject failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
@@ -1056,11 +1146,10 @@ static bool test_DeleteObject(struct dcerpc_pipe *p,
 }
 
 
-static bool test_CreateAccount(struct dcerpc_pipe *p,
+static bool test_CreateAccount(struct dcerpc_binding_handle *b,
                               struct torture_context *tctx,
                               struct policy_handle *handle)
 {
-       NTSTATUS status;
        struct lsa_CreateAccount r;
        struct dom_sid2 *newsid;
        struct policy_handle acct_handle;
@@ -1074,41 +1163,44 @@ static bool test_CreateAccount(struct dcerpc_pipe *p,
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
-       status = dcerpc_lsa_CreateAccount(p, tctx, &r);
-       if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_CreateAccount_r(b, tctx, &r),
+               "CreateAccount failed");
+       if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_OBJECT_NAME_COLLISION)) {
                struct lsa_OpenAccount r_o;
                r_o.in.handle = handle;
                r_o.in.sid = newsid;
                r_o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                r_o.out.acct_handle = &acct_handle;
 
-               status = dcerpc_lsa_OpenAccount(p, tctx, &r_o);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "OpenAccount failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenAccount_r(b, tctx, &r_o),
+                       "OpenAccount failed");
+               if (!NT_STATUS_IS_OK(r_o.out.result)) {
+                       torture_comment(tctx, "OpenAccount failed - %s\n",
+                                       nt_errstr(r_o.out.result));
                        return false;
                }
-       } else if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "CreateAccount failed - %s\n", nt_errstr(status));
+       } else if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "CreateAccount failed - %s\n",
+                               nt_errstr(r.out.result));
                return false;
        }
 
-       if (!test_Delete(p, tctx, &acct_handle)) {
+       if (!test_Delete(b, tctx, &acct_handle)) {
                return false;
        }
 
-       if (!test_DeleteObject(p, tctx, &acct_handle)) {
+       if (!test_DeleteObject(b, tctx, &acct_handle)) {
                return false;
        }
 
        return true;
 }
 
-static bool test_DeleteTrustedDomain(struct dcerpc_pipe *p,
+static bool test_DeleteTrustedDomain(struct dcerpc_binding_handle *b,
                                     struct torture_context *tctx,
                                     struct policy_handle *handle,
                                     struct lsa_StringLarge name)
 {
-       NTSTATUS status;
        struct lsa_OpenTrustedDomainByName r;
        struct policy_handle trustdom_handle;
 
@@ -1117,37 +1209,38 @@ static bool test_DeleteTrustedDomain(struct dcerpc_pipe *p,
        r.in.access_mask = SEC_STD_DELETE;
        r.out.trustdom_handle = &trustdom_handle;
 
-       status = dcerpc_lsa_OpenTrustedDomainByName(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenTrustedDomainByName_r(b, tctx, &r),
+               "OpenTrustedDomainByName failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "OpenTrustedDomainByName failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
-       if (!test_Delete(p, tctx, &trustdom_handle)) {
+       if (!test_Delete(b, tctx, &trustdom_handle)) {
                return false;
        }
 
-       if (!test_DeleteObject(p, tctx, &trustdom_handle)) {
+       if (!test_DeleteObject(b, tctx, &trustdom_handle)) {
                return false;
        }
 
        return true;
 }
 
-static bool test_DeleteTrustedDomainBySid(struct dcerpc_pipe *p,
+static bool test_DeleteTrustedDomainBySid(struct dcerpc_binding_handle *b,
                                          struct torture_context *tctx,
                                          struct policy_handle *handle,
                                          struct dom_sid *sid)
 {
-       NTSTATUS status;
        struct lsa_DeleteTrustedDomain r;
 
        r.in.handle = handle;
        r.in.dom_sid = sid;
 
-       status = dcerpc_lsa_DeleteTrustedDomain(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "DeleteTrustedDomain failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_DeleteTrustedDomain_r(b, tctx, &r),
+               "DeleteTrustedDomain failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "DeleteTrustedDomain failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
@@ -1188,9 +1281,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
        int i;
        const int LOCAL = 0;
        const int GLOBAL = 1;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       secname[LOCAL] = talloc_asprintf(tctx, "torturesecret-%u", (uint_t)random());
-       secname[GLOBAL] = talloc_asprintf(tctx, "G$torturesecret-%u", (uint_t)random());
+       secname[LOCAL] = talloc_asprintf(tctx, "torturesecret-%u", (unsigned int)random());
+       secname[GLOBAL] = talloc_asprintf(tctx, "G$torturesecret-%u", (unsigned int)random());
 
        for (i=0; i< 2; i++) {
                torture_comment(tctx, "\nTesting CreateSecret of %s\n", secname[i]);
@@ -1201,9 +1295,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                r.out.sec_handle = &sec_handle;
 
-               status = dcerpc_lsa_CreateSecret(p, tctx, &r);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "CreateSecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_CreateSecret_r(b, tctx, &r),
+                       "CreateSecret failed");
+               if (!NT_STATUS_IS_OK(r.out.result)) {
+                       torture_comment(tctx, "CreateSecret failed - %s\n", nt_errstr(r.out.result));
                        return false;
                }
 
@@ -1211,9 +1306,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                r.out.sec_handle = &sec_handle3;
 
-               status = dcerpc_lsa_CreateSecret(p, tctx, &r);
-               if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-                       torture_comment(tctx, "CreateSecret should have failed OBJECT_NAME_COLLISION - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_CreateSecret_r(b, tctx, &r),
+                       "CreateSecret failed");
+               if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_OBJECT_NAME_COLLISION)) {
+                       torture_comment(tctx, "CreateSecret should have failed OBJECT_NAME_COLLISION - %s\n", nt_errstr(r.out.result));
                        return false;
                }
 
@@ -1224,9 +1320,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "Testing OpenSecret\n");
 
-               status = dcerpc_lsa_OpenSecret(p, tctx, &r2);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "OpenSecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenSecret_r(b, tctx, &r2),
+                       "OpenSecret failed");
+               if (!NT_STATUS_IS_OK(r2.out.result)) {
+                       torture_comment(tctx, "OpenSecret failed - %s\n", nt_errstr(r2.out.result));
                        return false;
                }
 
@@ -1247,9 +1344,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "Testing SetSecret\n");
 
-               status = dcerpc_lsa_SetSecret(p, tctx, &r3);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "SetSecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_SetSecret_r(b, tctx, &r3),
+                       "SetSecret failed");
+               if (!NT_STATUS_IS_OK(r3.out.result)) {
+                       torture_comment(tctx, "SetSecret failed - %s\n", nt_errstr(r3.out.result));
                        return false;
                }
 
@@ -1265,9 +1363,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "Testing SetSecret with broken key\n");
 
-               status = dcerpc_lsa_SetSecret(p, tctx, &r3);
-               if (!NT_STATUS_EQUAL(status, NT_STATUS_UNKNOWN_REVISION)) {
-                       torture_comment(tctx, "SetSecret should have failed UNKNOWN_REVISION - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_SetSecret_r(b, tctx, &r3),
+                       "SetSecret failed");
+               if (!NT_STATUS_EQUAL(r3.out.result, NT_STATUS_UNKNOWN_REVISION)) {
+                       torture_comment(tctx, "SetSecret should have failed UNKNOWN_REVISION - %s\n", nt_errstr(r3.out.result));
                        ret = false;
                }
 
@@ -1286,9 +1385,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                bufp1.buf = NULL;
 
                torture_comment(tctx, "Testing QuerySecret\n");
-               status = dcerpc_lsa_QuerySecret(p, tctx, &r4);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "QuerySecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QuerySecret_r(b, tctx, &r4),
+                       "QuerySecret failed");
+               if (!NT_STATUS_IS_OK(r4.out.result)) {
+                       torture_comment(tctx, "QuerySecret failed - %s\n", nt_errstr(r4.out.result));
                        ret = false;
                } else {
                        if (r4.out.new_val == NULL || r4.out.new_val->buf == NULL) {
@@ -1321,12 +1421,13 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                r5.in.new_val->size = enc_key.length;
 
 
-               msleep(200);
+               smb_msleep(200);
                torture_comment(tctx, "Testing SetSecret (existing value should move to old)\n");
 
-               status = dcerpc_lsa_SetSecret(p, tctx, &r5);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "SetSecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_SetSecret_r(b, tctx, &r5),
+                       "SetSecret failed");
+               if (!NT_STATUS_IS_OK(r5.out.result)) {
+                       torture_comment(tctx, "SetSecret failed - %s\n", nt_errstr(r5.out.result));
                        ret = false;
                }
 
@@ -1345,9 +1446,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                bufp1.buf = NULL;
                bufp2.buf = NULL;
 
-               status = dcerpc_lsa_QuerySecret(p, tctx, &r6);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "QuerySecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QuerySecret_r(b, tctx, &r6),
+                       "QuerySecret failed");
+               if (!NT_STATUS_IS_OK(r6.out.result)) {
+                       torture_comment(tctx, "QuerySecret failed - %s\n", nt_errstr(r6.out.result));
                        ret = false;
                        secret4 = NULL;
                } else {
@@ -1406,9 +1508,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "Testing SetSecret of old Secret only\n");
 
-               status = dcerpc_lsa_SetSecret(p, tctx, &r7);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "SetSecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_SetSecret_r(b, tctx, &r7),
+                       "SetSecret failed");
+               if (!NT_STATUS_IS_OK(r7.out.result)) {
+                       torture_comment(tctx, "SetSecret failed - %s\n", nt_errstr(r7.out.result));
                        ret = false;
                }
 
@@ -1424,9 +1527,10 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                bufp1.buf = NULL;
                bufp2.buf = NULL;
 
-               status = dcerpc_lsa_QuerySecret(p, tctx, &r8);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "QuerySecret failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QuerySecret_r(b, tctx, &r8),
+                       "QuerySecret failed");
+               if (!NT_STATUS_IS_OK(r8.out.result)) {
+                       torture_comment(tctx, "QuerySecret failed - %s\n", nt_errstr(r8.out.result));
                        ret = false;
                } else {
                        if (!r8.out.new_val || !r8.out.old_val) {
@@ -1465,27 +1569,29 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                        }
                }
 
-               if (!test_Delete(p, tctx, &sec_handle)) {
+               if (!test_Delete(b, tctx, &sec_handle)) {
                        ret = false;
                }
 
-               if (!test_DeleteObject(p, tctx, &sec_handle)) {
+               if (!test_DeleteObject(b, tctx, &sec_handle)) {
                        return false;
                }
 
                d_o.in.handle = &sec_handle2;
                d_o.out.handle = &sec_handle2;
-               status = dcerpc_lsa_DeleteObject(p, tctx, &d_o);
-               if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
-                       torture_comment(tctx, "Second delete expected INVALID_HANDLE - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_DeleteObject_r(b, tctx, &d_o),
+                       "DeleteObject failed");
+               if (!NT_STATUS_EQUAL(d_o.out.result, NT_STATUS_INVALID_HANDLE)) {
+                       torture_comment(tctx, "Second delete expected INVALID_HANDLE - %s\n", nt_errstr(d_o.out.result));
                        ret = false;
                } else {
 
                        torture_comment(tctx, "Testing OpenSecret of just-deleted secret\n");
 
-                       status = dcerpc_lsa_OpenSecret(p, tctx, &r2);
-                       if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-                               torture_comment(tctx, "OpenSecret expected OBJECT_NAME_NOT_FOUND - %s\n", nt_errstr(status));
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenSecret_r(b, tctx, &r2),
+                               "OpenSecret failed");
+                       if (!NT_STATUS_EQUAL(r2.out.result, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                               torture_comment(tctx, "OpenSecret expected OBJECT_NAME_NOT_FOUND - %s\n", nt_errstr(r2.out.result));
                                ret = false;
                        }
                }
@@ -1496,12 +1602,11 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 }
 
 
-static bool test_EnumAccountRights(struct dcerpc_pipe *p,
+static bool test_EnumAccountRights(struct dcerpc_binding_handle *b,
                                   struct torture_context *tctx,
                                   struct policy_handle *acct_handle,
                                   struct dom_sid *sid)
 {
-       NTSTATUS status;
        struct lsa_EnumAccountRights r;
        struct lsa_RightSet rights;
 
@@ -1511,10 +1616,11 @@ static bool test_EnumAccountRights(struct dcerpc_pipe *p,
        r.in.sid = sid;
        r.out.rights = &rights;
 
-       status = dcerpc_lsa_EnumAccountRights(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumAccountRights_r(b, tctx, &r),
+               "EnumAccountRights failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
                torture_comment(tctx, "EnumAccountRights of %s failed - %s\n",
-                      dom_sid_string(tctx, sid), nt_errstr(status));
+                      dom_sid_string(tctx, sid), nt_errstr(r.out.result));
                return false;
        }
 
@@ -1522,12 +1628,11 @@ static bool test_EnumAccountRights(struct dcerpc_pipe *p,
 }
 
 
-static bool test_QuerySecurity(struct dcerpc_pipe *p,
+static bool test_QuerySecurity(struct dcerpc_binding_handle *b,
                             struct torture_context *tctx,
                             struct policy_handle *handle,
                             struct policy_handle *acct_handle)
 {
-       NTSTATUS status;
        struct lsa_QuerySecurity r;
        struct sec_desc_buf *sdbuf = NULL;
 
@@ -1544,21 +1649,21 @@ static bool test_QuerySecurity(struct dcerpc_pipe *p,
                        SECINFO_DACL;
        r.out.sdbuf = &sdbuf;
 
-       status = dcerpc_lsa_QuerySecurity(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "QuerySecurity failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QuerySecurity_r(b, tctx, &r),
+               "QuerySecurity failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "QuerySecurity failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
        return true;
 }
 
-static bool test_OpenAccount(struct dcerpc_pipe *p,
+static bool test_OpenAccount(struct dcerpc_binding_handle *b,
                             struct torture_context *tctx,
                             struct policy_handle *handle,
                             struct dom_sid *sid)
 {
-       NTSTATUS status;
        struct lsa_OpenAccount r;
        struct policy_handle acct_handle;
 
@@ -1569,32 +1674,32 @@ static bool test_OpenAccount(struct dcerpc_pipe *p,
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
-       status = dcerpc_lsa_OpenAccount(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "OpenAccount failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenAccount_r(b, tctx, &r),
+               "OpenAccount failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "OpenAccount failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
-       if (!test_EnumPrivsAccount(p, tctx, handle, &acct_handle)) {
+       if (!test_EnumPrivsAccount(b, tctx, handle, &acct_handle)) {
                return false;
        }
 
-       if (!test_GetSystemAccessAccount(p, tctx, handle, &acct_handle)) {
+       if (!test_GetSystemAccessAccount(b, tctx, handle, &acct_handle)) {
                return false;
        }
 
-       if (!test_QuerySecurity(p, tctx, handle, &acct_handle)) {
+       if (!test_QuerySecurity(b, tctx, handle, &acct_handle)) {
                return false;
        }
 
        return true;
 }
 
-static bool test_EnumAccounts(struct dcerpc_pipe *p,
+static bool test_EnumAccounts(struct dcerpc_binding_handle *b,
                              struct torture_context *tctx,
                              struct policy_handle *handle)
 {
-       NTSTATUS status;
        struct lsa_EnumAccounts r;
        struct lsa_SidArray sids1, sids2;
        uint32_t resume_handle = 0;
@@ -1611,20 +1716,21 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
 
        resume_handle = 0;
        while (true) {
-               status = dcerpc_lsa_EnumAccounts(p, tctx, &r);
-               if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumAccounts_r(b, tctx, &r),
+                       "EnumAccounts failed");
+               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_NO_MORE_ENTRIES)) {
                        break;
                }
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "EnumAccounts failed - %s\n", nt_errstr(status));
+               if (!NT_STATUS_IS_OK(r.out.result)) {
+                       torture_comment(tctx, "EnumAccounts failed - %s\n", nt_errstr(r.out.result));
                        return false;
                }
 
-               if (!test_LookupSids(p, tctx, handle, &sids1)) {
+               if (!test_LookupSids(b, tctx, handle, &sids1)) {
                        return false;
                }
 
-               if (!test_LookupSids2(p, tctx, handle, &sids1)) {
+               if (!test_LookupSids2(b, tctx, handle, &sids1)) {
                        return false;
                }
 
@@ -1634,8 +1740,8 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "Testing all accounts\n");
                for (i=0;i<sids1.num_sids;i++) {
-                       ret &= test_OpenAccount(p, tctx, handle, sids1.sids[i].sid);
-                       ret &= test_EnumAccountRights(p, tctx, handle, sids1.sids[i].sid);
+                       ret &= test_OpenAccount(b, tctx, handle, sids1.sids[i].sid);
+                       ret &= test_EnumAccountRights(b, tctx, handle, sids1.sids[i].sid);
                }
                torture_comment(tctx, "\n");
        }
@@ -1649,9 +1755,10 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
        r.in.num_entries = 1;
        r.out.sids = &sids2;
 
-       status = dcerpc_lsa_EnumAccounts(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "EnumAccounts failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumAccounts_r(b, tctx, &r),
+               "EnumAccounts failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "EnumAccounts failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
@@ -1663,13 +1770,12 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_LookupPrivDisplayName(struct dcerpc_pipe *p,
+static bool test_LookupPrivDisplayName(struct dcerpc_binding_handle *b,
                                       struct torture_context *tctx,
                                       struct policy_handle *handle,
                                       struct lsa_String *priv_name)
 {
        struct lsa_LookupPrivDisplayName r;
-       NTSTATUS status;
        /* produce a reasonable range of language output without screwing up
           terminals */
        uint16_t language_id = (random() % 4) + 0x409;
@@ -1685,9 +1791,10 @@ static bool test_LookupPrivDisplayName(struct dcerpc_pipe *p,
        r.out.returned_language_id = &returned_language_id;
        r.out.disp_name = &disp_name;
 
-       status = dcerpc_lsa_LookupPrivDisplayName(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "LookupPrivDisplayName failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupPrivDisplayName_r(b, tctx, &r),
+               "LookupPrivDisplayName failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "LookupPrivDisplayName failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
        torture_comment(tctx, "%s -> \"%s\"  (language 0x%x/0x%x)\n",
@@ -1697,14 +1804,13 @@ static bool test_LookupPrivDisplayName(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
+static bool test_EnumAccountsWithUserRight(struct dcerpc_binding_handle *b,
                                           struct torture_context *tctx,
                                           struct policy_handle *handle,
                                           struct lsa_String *priv_name)
 {
        struct lsa_EnumAccountsWithUserRight r;
        struct lsa_SidArray sids;
-       NTSTATUS status;
 
        ZERO_STRUCT(sids);
 
@@ -1714,15 +1820,16 @@ static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
        r.in.name = priv_name;
        r.out.sids = &sids;
 
-       status = dcerpc_lsa_EnumAccountsWithUserRight(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumAccountsWithUserRight_r(b, tctx, &r),
+               "EnumAccountsWithUserRight failed");
 
        /* NT_STATUS_NO_MORE_ENTRIES means noone has this privilege */
-       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+       if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_NO_MORE_ENTRIES)) {
                return true;
        }
 
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "EnumAccountsWithUserRight failed - %s\n", nt_errstr(status));
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "EnumAccountsWithUserRight failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
@@ -1730,11 +1837,10 @@ static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
 }
 
 
-static bool test_EnumPrivs(struct dcerpc_pipe *p,
+static bool test_EnumPrivs(struct dcerpc_binding_handle *b,
                           struct torture_context *tctx,
                           struct policy_handle *handle)
 {
-       NTSTATUS status;
        struct lsa_EnumPrivs r;
        struct lsa_PrivArray privs1;
        uint32_t resume_handle = 0;
@@ -1750,16 +1856,17 @@ static bool test_EnumPrivs(struct dcerpc_pipe *p,
        r.out.privs = &privs1;
 
        resume_handle = 0;
-       status = dcerpc_lsa_EnumPrivs(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "EnumPrivs failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumPrivs_r(b, tctx, &r),
+               "EnumPrivs failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "EnumPrivs failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
        for (i = 0; i< privs1.count; i++) {
-               test_LookupPrivDisplayName(p, tctx, handle, (struct lsa_String *)&privs1.privs[i].name);
-               test_LookupPrivValue(p, tctx, handle, (struct lsa_String *)&privs1.privs[i].name);
-               if (!test_EnumAccountsWithUserRight(p, tctx, handle, (struct lsa_String *)&privs1.privs[i].name)) {
+               test_LookupPrivDisplayName(b, tctx, handle, (struct lsa_String *)&privs1.privs[i].name);
+               test_LookupPrivValue(b, tctx, handle, (struct lsa_String *)&privs1.privs[i].name);
+               if (!test_EnumAccountsWithUserRight(b, tctx, handle, (struct lsa_String *)&privs1.privs[i].name)) {
                        ret = false;
                }
        }
@@ -1767,14 +1874,13 @@ static bool test_EnumPrivs(struct dcerpc_pipe *p,
        return ret;
 }
 
-static bool test_QueryForestTrustInformation(struct dcerpc_pipe *p,
+static bool test_QueryForestTrustInformation(struct dcerpc_binding_handle *b,
                                             struct torture_context *tctx,
                                             struct policy_handle *handle,
                                             const char *trusted_domain_name)
 {
        bool ret = true;
        struct lsa_lsaRQueryForestTrustInformation r;
-       NTSTATUS status;
        struct lsa_String string;
        struct lsa_ForestTrustInformation info, *info_ptr;
 
@@ -1798,17 +1904,18 @@ static bool test_QueryForestTrustInformation(struct dcerpc_pipe *p,
        r.in.unknown = 0;
        r.out.forest_trust_info = &info_ptr;
 
-       status = dcerpc_lsa_lsaRQueryForestTrustInformation(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_lsaRQueryForestTrustInformation_r(b, tctx, &r),
+               "lsaRQueryForestTrustInformation failed");
 
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "lsaRQueryForestTrustInformation of %s failed - %s\n", trusted_domain_name, nt_errstr(status));
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "lsaRQueryForestTrustInformation of %s failed - %s\n", trusted_domain_name, nt_errstr(r.out.result));
                ret = false;
        }
 
        return ret;
 }
 
-static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p,
+static bool test_query_each_TrustDomEx(struct dcerpc_binding_handle *b,
                                       struct torture_context *tctx,
                                       struct policy_handle *handle,
                                       struct lsa_DomainListEx *domains)
@@ -1819,7 +1926,7 @@ static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p,
        for (i=0; i< domains->count; i++) {
 
                if (domains->domains[i].trust_attributes & NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) {
-                       ret &= test_QueryForestTrustInformation(p, tctx, handle,
+                       ret &= test_QueryForestTrustInformation(b, tctx, handle,
                                                                domains->domains[i].domain_name.string);
                }
        }
@@ -1827,12 +1934,11 @@ static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p,
        return ret;
 }
 
-static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
+static bool test_query_each_TrustDom(struct dcerpc_binding_handle *b,
                                     struct torture_context *tctx,
                                     struct policy_handle *handle,
                                     struct lsa_DomainList *domains)
 {
-       NTSTATUS status;
        int i,j;
        bool ret = true;
 
@@ -1853,10 +1959,11 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                        trust.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                        trust.out.trustdom_handle = &trustdom_handle;
 
-                       status = dcerpc_lsa_OpenTrustedDomain(p, tctx, &trust);
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenTrustedDomain_r(b, tctx, &trust),
+                               "OpenTrustedDomain failed");
 
-                       if (!NT_STATUS_IS_OK(status)) {
-                               torture_comment(tctx, "OpenTrustedDomain failed - %s\n", nt_errstr(status));
+                       if (!NT_STATUS_IS_OK(trust.out.result)) {
+                               torture_comment(tctx, "OpenTrustedDomain failed - %s\n", nt_errstr(trust.out.result));
                                return false;
                        }
 
@@ -1872,30 +1979,33 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                                q.in.trustdom_handle = &trustdom_handle;
                                q.in.level = levels[j];
                                q.out.info = &info;
-                               status = dcerpc_lsa_QueryTrustedDomainInfo(p, tctx, &q);
-                               if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryTrustedDomainInfo_r(b, tctx, &q),
+                                       "QueryTrustedDomainInfo failed");
+                               if (!NT_STATUS_IS_OK(q.out.result) && ok[j]) {
                                        torture_comment(tctx, "QueryTrustedDomainInfo level %d failed - %s\n",
-                                              levels[j], nt_errstr(status));
+                                              levels[j], nt_errstr(q.out.result));
                                        ret = false;
-                               } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                               } else if (NT_STATUS_IS_OK(q.out.result) && !ok[j]) {
                                        torture_comment(tctx, "QueryTrustedDomainInfo level %d unexpectedly succeeded - %s\n",
-                                              levels[j], nt_errstr(status));
+                                              levels[j], nt_errstr(q.out.result));
                                        ret = false;
                                }
                        }
 
-                       status = dcerpc_lsa_CloseTrustedDomainEx(p, tctx, &c_trust);
-                       if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
-                               torture_comment(tctx, "Expected CloseTrustedDomainEx to return NT_STATUS_NOT_IMPLEMENTED, instead - %s\n", nt_errstr(status));
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_CloseTrustedDomainEx_r(b, tctx, &c_trust),
+                               "CloseTrustedDomainEx failed");
+                       if (!NT_STATUS_EQUAL(c_trust.out.result, NT_STATUS_NOT_IMPLEMENTED)) {
+                               torture_comment(tctx, "Expected CloseTrustedDomainEx to return NT_STATUS_NOT_IMPLEMENTED, instead - %s\n", nt_errstr(c_trust.out.result));
                                return false;
                        }
 
                        c.in.handle = &trustdom_handle;
                        c.out.handle = &handle2;
 
-                       status = dcerpc_lsa_Close(p, tctx, &c);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               torture_comment(tctx, "Close of trusted domain failed - %s\n", nt_errstr(status));
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_Close_r(b, tctx, &c),
+                               "Close failed");
+                       if (!NT_STATUS_IS_OK(c.out.result)) {
+                               torture_comment(tctx, "Close of trusted domain failed - %s\n", nt_errstr(c.out.result));
                                return false;
                        }
 
@@ -1912,14 +2022,15 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                                q.in.level   = levels[j];
                                q.out.info   = &info;
 
-                               status = dcerpc_lsa_QueryTrustedDomainInfoBySid(p, tctx, &q);
-                               if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryTrustedDomainInfoBySid_r(b, tctx, &q),
+                                       "lsa_QueryTrustedDomainInfoBySid failed");
+                               if (!NT_STATUS_IS_OK(q.out.result) && ok[j]) {
                                        torture_comment(tctx, "QueryTrustedDomainInfoBySid level %d failed - %s\n",
-                                              levels[j], nt_errstr(status));
+                                              levels[j], nt_errstr(q.out.result));
                                        ret = false;
-                               } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                               } else if (NT_STATUS_IS_OK(q.out.result) && !ok[j]) {
                                        torture_comment(tctx, "QueryTrustedDomainInfoBySid level %d unexpectedly succeeded - %s\n",
-                                              levels[j], nt_errstr(status));
+                                              levels[j], nt_errstr(q.out.result));
                                        ret = false;
                                }
                        }
@@ -1930,10 +2041,11 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                trust_by_name.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                trust_by_name.out.trustdom_handle = &trustdom_handle;
 
-               status = dcerpc_lsa_OpenTrustedDomainByName(p, tctx, &trust_by_name);
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenTrustedDomainByName_r(b, tctx, &trust_by_name),
+                       "OpenTrustedDomainByName failed");
 
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+               if (!NT_STATUS_IS_OK(trust_by_name.out.result)) {
+                       torture_comment(tctx, "OpenTrustedDomainByName failed - %s\n", nt_errstr(trust_by_name.out.result));
                        return false;
                }
 
@@ -1943,14 +2055,15 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                        q.in.trustdom_handle = &trustdom_handle;
                        q.in.level = levels[j];
                        q.out.info = &info;
-                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, tctx, &q);
-                       if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryTrustedDomainInfo_r(b, tctx, &q),
+                               "QueryTrustedDomainInfo failed");
+                       if (!NT_STATUS_IS_OK(q.out.result) && ok[j]) {
                                torture_comment(tctx, "QueryTrustedDomainInfo level %d failed - %s\n",
-                                      levels[j], nt_errstr(status));
+                                      levels[j], nt_errstr(q.out.result));
                                ret = false;
-                       } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                       } else if (NT_STATUS_IS_OK(q.out.result) && !ok[j]) {
                                torture_comment(tctx, "QueryTrustedDomainInfo level %d unexpectedly succeeded - %s\n",
-                                      levels[j], nt_errstr(status));
+                                      levels[j], nt_errstr(q.out.result));
                                ret = false;
                        }
                }
@@ -1958,9 +2071,10 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                c.in.handle = &trustdom_handle;
                c.out.handle = &handle2;
 
-               status = dcerpc_lsa_Close(p, tctx, &c);
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "Close of trusted domain failed - %s\n", nt_errstr(status));
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_Close_r(b, tctx, &c),
+                       "Close failed");
+               if (!NT_STATUS_IS_OK(c.out.result)) {
+                       torture_comment(tctx, "Close of trusted domain failed - %s\n", nt_errstr(c.out.result));
                        return false;
                }
 
@@ -1975,14 +2089,15 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                        q.in.trusted_domain = &name;
                        q.in.level          = levels[j];
                        q.out.info          = &info;
-                       status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, tctx, &q);
-                       if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryTrustedDomainInfoByName_r(b, tctx, &q),
+                               "QueryTrustedDomainInfoByName failed");
+                       if (!NT_STATUS_IS_OK(q.out.result) && ok[j]) {
                                torture_comment(tctx, "QueryTrustedDomainInfoByName level %d failed - %s\n",
-                                      levels[j], nt_errstr(status));
+                                      levels[j], nt_errstr(q.out.result));
                                ret = false;
-                       } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                       } else if (NT_STATUS_IS_OK(q.out.result) && !ok[j]) {
                                torture_comment(tctx, "QueryTrustedDomainInfoByName level %d unexpectedly succeeded - %s\n",
-                                      levels[j], nt_errstr(status));
+                                      levels[j], nt_errstr(q.out.result));
                                ret = false;
                        }
                }
@@ -1990,56 +2105,94 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
        return ret;
 }
 
-static bool test_EnumTrustDom(struct dcerpc_pipe *p,
+static bool test_EnumTrustDom(struct dcerpc_binding_handle *b,
                              struct torture_context *tctx,
                              struct policy_handle *handle)
 {
        struct lsa_EnumTrustDom r;
-       NTSTATUS enum_status;
-       uint32_t resume_handle = 0;
+       uint32_t in_resume_handle = 0;
+       uint32_t out_resume_handle;
        struct lsa_DomainList domains;
        bool ret = true;
 
        torture_comment(tctx, "\nTesting EnumTrustDom\n");
 
        r.in.handle = handle;
-       r.in.resume_handle = &resume_handle;
+       r.in.resume_handle = &in_resume_handle;
        r.in.max_size = 0;
        r.out.domains = &domains;
-       r.out.resume_handle = &resume_handle;
-
-       enum_status = dcerpc_lsa_EnumTrustDom(p, tctx, &r);
+       r.out.resume_handle = &out_resume_handle;
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumTrustDom_r(b, tctx, &r),
+               "lsa_EnumTrustDom failed");
+
+       /* according to MS-LSAD 3.1.4.7.8 output resume handle MUST
+        * always be larger than the previous input resume handle, in
+        * particular when hitting the last query it is vital to set the
+        * resume handle correctly to avoid infinite client loops, as
+        * seen e.g.  with Windows XP SP3 when resume handle is 0 and
+        * status is NT_STATUS_OK - gd */
+
+       if (NT_STATUS_IS_OK(r.out.result) ||
+           NT_STATUS_EQUAL(r.out.result, NT_STATUS_NO_MORE_ENTRIES) ||
+           NT_STATUS_EQUAL(r.out.result, STATUS_MORE_ENTRIES))
+       {
+               if (out_resume_handle <= in_resume_handle) {
+                       torture_comment(tctx, "EnumTrustDom failed - should have returned output resume_handle (0x%08x) larger than input resume handle (0x%08x)\n",
+                               out_resume_handle, in_resume_handle);
+                       return false;
+               }
+       }
 
-       if (NT_STATUS_IS_OK(enum_status)) {
+       if (NT_STATUS_IS_OK(r.out.result)) {
                if (domains.count == 0) {
                        torture_comment(tctx, "EnumTrustDom failed - should have returned 'NT_STATUS_NO_MORE_ENTRIES' for 0 trusted domains\n");
                        return false;
                }
-       } else if (!(NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES))) {
-               torture_comment(tctx, "EnumTrustDom of zero size failed - %s\n", nt_errstr(enum_status));
+       } else if (!(NT_STATUS_EQUAL(r.out.result, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(r.out.result, NT_STATUS_NO_MORE_ENTRIES))) {
+               torture_comment(tctx, "EnumTrustDom of zero size failed - %s\n", nt_errstr(r.out.result));
                return false;
        }
 
        /* Start from the bottom again */
-       resume_handle = 0;
+       in_resume_handle = 0;
 
        do {
                r.in.handle = handle;
-               r.in.resume_handle = &resume_handle;
+               r.in.resume_handle = &in_resume_handle;
                r.in.max_size = LSA_ENUM_TRUST_DOMAIN_MULTIPLIER * 3;
                r.out.domains = &domains;
-               r.out.resume_handle = &resume_handle;
-
-               enum_status = dcerpc_lsa_EnumTrustDom(p, tctx, &r);
+               r.out.resume_handle = &out_resume_handle;
+
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumTrustDom_r(b, tctx, &r),
+                       "EnumTrustDom failed");
+
+               /* according to MS-LSAD 3.1.4.7.8 output resume handle MUST
+                * always be larger than the previous input resume handle, in
+                * particular when hitting the last query it is vital to set the
+                * resume handle correctly to avoid infinite client loops, as
+                * seen e.g.  with Windows XP SP3 when resume handle is 0 and
+                * status is NT_STATUS_OK - gd */
+
+               if (NT_STATUS_IS_OK(r.out.result) ||
+                   NT_STATUS_EQUAL(r.out.result, NT_STATUS_NO_MORE_ENTRIES) ||
+                   NT_STATUS_EQUAL(r.out.result, STATUS_MORE_ENTRIES))
+               {
+                       if (out_resume_handle <= in_resume_handle) {
+                               torture_comment(tctx, "EnumTrustDom failed - should have returned output resume_handle (0x%08x) larger than input resume handle (0x%08x)\n",
+                                       out_resume_handle, in_resume_handle);
+                               return false;
+                       }
+               }
 
                /* NO_MORE_ENTRIES is allowed */
-               if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
+               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_NO_MORE_ENTRIES)) {
                        if (domains.count == 0) {
                                return true;
                        }
                        torture_comment(tctx, "EnumTrustDom failed - should have returned 0 trusted domains with 'NT_STATUS_NO_MORE_ENTRIES'\n");
                        return false;
-               } else if (NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)) {
+               } else if (NT_STATUS_EQUAL(r.out.result, STATUS_MORE_ENTRIES)) {
                        /* Windows 2003 gets this off by one on the first run */
                        if (r.out.domains->count < 3 || r.out.domains->count > 4) {
                                torture_comment(tctx, "EnumTrustDom didn't fill the buffer we "
@@ -2048,8 +2201,8 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
                                       LSA_ENUM_TRUST_DOMAIN_MULTIPLIER, r.in.max_size);
                                ret = false;
                        }
-               } else if (!NT_STATUS_IS_OK(enum_status)) {
-                       torture_comment(tctx, "EnumTrustDom failed - %s\n", nt_errstr(enum_status));
+               } else if (!NT_STATUS_IS_OK(r.out.result)) {
+                       torture_comment(tctx, "EnumTrustDom failed - %s\n", nt_errstr(r.out.result));
                        return false;
                }
 
@@ -2058,19 +2211,20 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
                        return false;
                }
 
-               ret &= test_query_each_TrustDom(p, tctx, handle, &domains);
+               ret &= test_query_each_TrustDom(b, tctx, handle, &domains);
+
+               in_resume_handle = out_resume_handle;
 
-       } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
+       } while ((NT_STATUS_EQUAL(r.out.result, STATUS_MORE_ENTRIES)));
 
        return ret;
 }
 
-static bool test_EnumTrustDomEx(struct dcerpc_pipe *p,
+static bool test_EnumTrustDomEx(struct dcerpc_binding_handle *b,
                                struct torture_context *tctx,
                                struct policy_handle *handle)
 {
        struct lsa_EnumTrustedDomainsEx r_ex;
-       NTSTATUS enum_status;
        uint32_t resume_handle = 0;
        struct lsa_DomainListEx domains_ex;
        bool ret = true;
@@ -2083,10 +2237,11 @@ static bool test_EnumTrustDomEx(struct dcerpc_pipe *p,
        r_ex.out.domains = &domains_ex;
        r_ex.out.resume_handle = &resume_handle;
 
-       enum_status = dcerpc_lsa_EnumTrustedDomainsEx(p, tctx, &r_ex);
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumTrustedDomainsEx_r(b, tctx, &r_ex),
+               "EnumTrustedDomainsEx failed");
 
-       if (!(NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES))) {
-               torture_comment(tctx, "EnumTrustedDomainEx of zero size failed - %s\n", nt_errstr(enum_status));
+       if (!(NT_STATUS_EQUAL(r_ex.out.result, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(r_ex.out.result, NT_STATUS_NO_MORE_ENTRIES))) {
+               torture_comment(tctx, "EnumTrustedDomainEx of zero size failed - %s\n", nt_errstr(r_ex.out.result));
                return false;
        }
 
@@ -2098,16 +2253,17 @@ static bool test_EnumTrustDomEx(struct dcerpc_pipe *p,
                r_ex.out.domains = &domains_ex;
                r_ex.out.resume_handle = &resume_handle;
 
-               enum_status = dcerpc_lsa_EnumTrustedDomainsEx(p, tctx, &r_ex);
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_EnumTrustedDomainsEx_r(b, tctx, &r_ex),
+                       "EnumTrustedDomainsEx failed");
 
                /* NO_MORE_ENTRIES is allowed */
-               if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
+               if (NT_STATUS_EQUAL(r_ex.out.result, NT_STATUS_NO_MORE_ENTRIES)) {
                        if (domains_ex.count == 0) {
                                return true;
                        }
                        torture_comment(tctx, "EnumTrustDomainsEx failed - should have returned 0 trusted domains with 'NT_STATUS_NO_MORE_ENTRIES'\n");
                        return false;
-               } else if (NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)) {
+               } else if (NT_STATUS_EQUAL(r_ex.out.result, STATUS_MORE_ENTRIES)) {
                        /* Windows 2003 gets this off by one on the first run */
                        if (r_ex.out.domains->count < 3 || r_ex.out.domains->count > 4) {
                                torture_comment(tctx, "EnumTrustDom didn't fill the buffer we "
@@ -2117,8 +2273,8 @@ static bool test_EnumTrustDomEx(struct dcerpc_pipe *p,
                                       LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER,
                                       r_ex.in.max_size / LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER);
                        }
-               } else if (!NT_STATUS_IS_OK(enum_status)) {
-                       torture_comment(tctx, "EnumTrustedDomainEx failed - %s\n", nt_errstr(enum_status));
+               } else if (!NT_STATUS_IS_OK(r_ex.out.result)) {
+                       torture_comment(tctx, "EnumTrustedDomainEx failed - %s\n", nt_errstr(r_ex.out.result));
                        return false;
                }
 
@@ -2127,39 +2283,42 @@ static bool test_EnumTrustDomEx(struct dcerpc_pipe *p,
                        return false;
                }
 
-               ret &= test_query_each_TrustDomEx(p, tctx, handle, &domains_ex);
+               ret &= test_query_each_TrustDomEx(b, tctx, handle, &domains_ex);
 
-       } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
+       } while ((NT_STATUS_EQUAL(r_ex.out.result, STATUS_MORE_ENTRIES)));
 
        return ret;
 }
 
 
-static bool test_CreateTrustedDomain(struct dcerpc_pipe *p,
+static bool test_CreateTrustedDomain(struct dcerpc_binding_handle *b,
                                     struct torture_context *tctx,
-                                    struct policy_handle *handle)
+                                    struct policy_handle *handle,
+                                    uint32_t num_trusts)
 {
-       NTSTATUS status;
        bool ret = true;
        struct lsa_CreateTrustedDomain r;
        struct lsa_DomainInfo trustinfo;
-       struct dom_sid *domsid[12];
-       struct policy_handle trustdom_handle[12];
+       struct dom_sid **domsid;
+       struct policy_handle *trustdom_handle;
        struct lsa_QueryTrustedDomainInfo q;
        union lsa_TrustedDomainInfo *info = NULL;
        int i;
 
-       torture_comment(tctx, "\nTesting CreateTrustedDomain for 12 domains\n");
+       torture_comment(tctx, "\nTesting CreateTrustedDomain for %d domains\n", num_trusts);
 
-       if (!test_EnumTrustDom(p, tctx, handle)) {
+       if (!test_EnumTrustDom(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_EnumTrustDomEx(p, tctx, handle)) {
+       if (!test_EnumTrustDomEx(b, tctx, handle)) {
                ret = false;
        }
 
-       for (i=0; i< 12; i++) {
+       domsid = talloc_array(tctx, struct dom_sid *, num_trusts);
+       trustdom_handle = talloc_array(tctx, struct policy_handle, num_trusts);
+
+       for (i=0; i< num_trusts; i++) {
                char *trust_name = talloc_asprintf(tctx, "torturedom%02d", i);
                char *trust_sid = talloc_asprintf(tctx, "S-1-5-21-97398-379795-100%02d", i);
 
@@ -2173,28 +2332,31 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p,
                r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                r.out.trustdom_handle = &trustdom_handle[i];
 
-               status = dcerpc_lsa_CreateTrustedDomain(p, tctx, &r);
-               if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-                       test_DeleteTrustedDomain(p, tctx, handle, trustinfo.name);
-                       status = dcerpc_lsa_CreateTrustedDomain(p, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_CreateTrustedDomain_r(b, tctx, &r),
+                       "CreateTrustedDomain failed");
+               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_OBJECT_NAME_COLLISION)) {
+                       test_DeleteTrustedDomain(b, tctx, handle, trustinfo.name);
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_CreateTrustedDomain_r(b, tctx, &r),
+                               "CreateTrustedDomain failed");
                }
-               if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "CreateTrustedDomain failed - %s\n", nt_errstr(status));
+               if (!NT_STATUS_IS_OK(r.out.result)) {
+                       torture_comment(tctx, "CreateTrustedDomain failed - %s\n", nt_errstr(r.out.result));
                        ret = false;
                } else {
 
                        q.in.trustdom_handle = &trustdom_handle[i];
                        q.in.level = LSA_TRUSTED_DOMAIN_INFO_INFO_EX;
                        q.out.info = &info;
-                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, tctx, &q);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               torture_comment(tctx, "QueryTrustedDomainInfo level 1 failed - %s\n", nt_errstr(status));
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryTrustedDomainInfo_r(b, tctx, &q),
+                               "QueryTrustedDomainInfo failed");
+                       if (!NT_STATUS_IS_OK(q.out.result)) {
+                               torture_comment(tctx, "QueryTrustedDomainInfo level %d failed - %s\n", q.in.level, nt_errstr(q.out.result));
                                ret = false;
                        } else if (!q.out.info) {
                                ret = false;
                        } else {
                                if (strcmp(info->info_ex.netbios_name.string, trustinfo.name.string) != 0) {
-                                       torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n",
+                                       torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistent short name: %s != %s\n",
                                               info->info_ex.netbios_name.string, trustinfo.name.string);
                                        ret = false;
                                }
@@ -2218,16 +2380,16 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p,
        }
 
        /* now that we have some domains to look over, we can test the enum calls */
-       if (!test_EnumTrustDom(p, tctx, handle)) {
+       if (!test_EnumTrustDom(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_EnumTrustDomEx(p, tctx, handle)) {
+       if (!test_EnumTrustDomEx(b, tctx, handle)) {
                ret = false;
        }
 
-       for (i=0; i<12; i++) {
-               if (!test_DeleteTrustedDomainBySid(p, tctx, handle, domsid[i])) {
+       for (i=0; i<num_trusts; i++) {
+               if (!test_DeleteTrustedDomainBySid(b, tctx, handle, domsid[i])) {
                        ret = false;
                }
        }
@@ -2235,26 +2397,254 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p,
        return ret;
 }
 
-static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p,
-                                       struct torture_context *tctx,
-                                       struct policy_handle *handle)
+static bool gen_authinfo_internal(TALLOC_CTX *mem_ctx, const char *password,
+                                 DATA_BLOB session_key,
+                                 struct lsa_TrustDomainInfoAuthInfoInternal **_authinfo_internal)
+{
+       struct lsa_TrustDomainInfoAuthInfoInternal *authinfo_internal;
+       struct trustDomainPasswords auth_struct;
+       struct AuthenticationInformation *auth_info_array;
+       size_t converted_size;
+       DATA_BLOB auth_blob;
+       enum ndr_err_code ndr_err;
+
+       authinfo_internal = talloc_zero(mem_ctx, struct lsa_TrustDomainInfoAuthInfoInternal);
+       if (authinfo_internal == NULL) {
+               return false;
+       }
+
+       auth_info_array = talloc_array(mem_ctx,
+                                      struct AuthenticationInformation, 1);
+       if (auth_info_array == NULL) {
+               return false;
+       }
+
+       generate_random_buffer(auth_struct.confounder, sizeof(auth_struct.confounder));
+
+       auth_info_array[0].AuthType = TRUST_AUTH_TYPE_CLEAR;
+
+       if (!convert_string_talloc(mem_ctx, CH_UNIX, CH_UTF16, password,
+                                 strlen(password),
+                                 &auth_info_array[0].AuthInfo.clear.password,
+                                 &converted_size)) {
+               return false;
+       }
+
+       auth_info_array[0].AuthInfo.clear.size = converted_size;
+
+       auth_struct.outgoing.count = 1;
+       auth_struct.outgoing.current.count = 1;
+       auth_struct.outgoing.current.array = auth_info_array;
+       auth_struct.outgoing.previous.count = 0;
+       auth_struct.outgoing.previous.array = NULL;
+
+       auth_struct.incoming.count = 1;
+       auth_struct.incoming.current.count = 1;
+       auth_struct.incoming.current.array = auth_info_array;
+       auth_struct.incoming.previous.count = 0;
+       auth_struct.incoming.previous.array = NULL;
+
+
+       ndr_err = ndr_push_struct_blob(&auth_blob, mem_ctx, &auth_struct,
+                                      (ndr_push_flags_fn_t)ndr_push_trustDomainPasswords);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               return false;
+       }
+
+       arcfour_crypt_blob(auth_blob.data, auth_blob.length, &session_key);
+
+       authinfo_internal->auth_blob.size = auth_blob.length;
+       authinfo_internal->auth_blob.data = auth_blob.data;
+
+       *_authinfo_internal = authinfo_internal;
+
+       return true;
+}
+
+static bool gen_authinfo(TALLOC_CTX *mem_ctx, const char *password,
+                        struct lsa_TrustDomainInfoAuthInfo **_authinfo)
+{
+       struct lsa_TrustDomainInfoAuthInfo *authinfo;
+       struct lsa_TrustDomainInfoBuffer *info_buffer;
+       size_t converted_size;
+
+       authinfo = talloc_zero(mem_ctx, struct lsa_TrustDomainInfoAuthInfo);
+       if (authinfo == NULL) {
+               return false;
+       }
+
+       info_buffer = talloc_zero(mem_ctx, struct lsa_TrustDomainInfoBuffer);
+       if (info_buffer == NULL) {
+               return false;
+       }
+
+       info_buffer->AuthType = TRUST_AUTH_TYPE_CLEAR;
+
+       if (!convert_string_talloc(mem_ctx, CH_UNIX, CH_UTF16, password,
+                                 strlen(password),
+                                 &info_buffer->data.data,
+                                 &converted_size)) {
+               return false;
+       }
+
+       info_buffer->data.size = converted_size;
+
+       authinfo->incoming_count = 1;
+       authinfo->incoming_current_auth_info = info_buffer;
+       authinfo->incoming_previous_auth_info = NULL;
+       authinfo->outgoing_count = 1;
+       authinfo->outgoing_current_auth_info = info_buffer;
+       authinfo->outgoing_previous_auth_info = NULL;
+
+       *_authinfo = authinfo;
+
+       return true;
+}
+
+static bool check_pw_with_ServerAuthenticate3(struct dcerpc_pipe *p,
+                                            struct torture_context *tctx,
+                                            uint32_t negotiate_flags,
+                                            struct cli_credentials *machine_credentials,
+                                            struct netlogon_creds_CredentialState **creds_out)
+{
+       struct netr_ServerReqChallenge r;
+       struct netr_ServerAuthenticate3 a;
+       struct netr_Credential credentials1, credentials2, credentials3;
+       struct netlogon_creds_CredentialState *creds;
+       struct samr_Password mach_password;
+       uint32_t rid;
+       const char *machine_name;
+       const char *plain_pass;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       machine_name = cli_credentials_get_workstation(machine_credentials);
+       plain_pass = cli_credentials_get_password(machine_credentials);
+
+       r.in.server_name = NULL;
+       r.in.computer_name = machine_name;
+       r.in.credentials = &credentials1;
+       r.out.return_credentials = &credentials2;
+
+       generate_random_buffer(credentials1.data, sizeof(credentials1.data));
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_netr_ServerReqChallenge_r(b, tctx, &r),
+               "ServerReqChallenge failed");
+       torture_assert_ntstatus_ok(tctx, r.out.result, "ServerReqChallenge failed");
+
+       E_md4hash(plain_pass, mach_password.hash);
+
+       a.in.server_name = NULL;
+       a.in.account_name = talloc_asprintf(tctx, "%s$", machine_name);
+       a.in.secure_channel_type = cli_credentials_get_secure_channel_type(machine_credentials);
+       a.in.computer_name = machine_name;
+       a.in.negotiate_flags = &negotiate_flags;
+       a.in.credentials = &credentials3;
+       a.out.return_credentials = &credentials3;
+       a.out.negotiate_flags = &negotiate_flags;
+       a.out.rid = &rid;
+
+       creds = netlogon_creds_client_init(tctx, a.in.account_name,
+                                          a.in.computer_name,
+                                          &credentials1, &credentials2,
+                                          &mach_password, &credentials3,
+                                          negotiate_flags);
+
+       torture_assert(tctx, creds != NULL, "memory allocation");
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_netr_ServerAuthenticate3_r(b, tctx, &a),
+               "ServerAuthenticate3 failed");
+       if (!NT_STATUS_IS_OK(a.out.result)) {
+               if (!NT_STATUS_EQUAL(a.out.result, NT_STATUS_ACCESS_DENIED)) {
+                       torture_assert_ntstatus_ok(tctx, a.out.result,
+                                                  "ServerAuthenticate3 failed");
+               }
+               return false;
+       }
+       torture_assert(tctx, netlogon_creds_client_check(creds, &credentials3), "Credential chaining failed");
+
+       /* Prove that requesting a challenge again won't break it */
+       torture_assert_ntstatus_ok(tctx, dcerpc_netr_ServerReqChallenge_r(b, tctx, &r),
+               "ServerReqChallenge failed");
+       torture_assert_ntstatus_ok(tctx, r.out.result, "ServerReqChallenge failed");
+
+       *creds_out = creds;
+       return true;
+}
+
+static bool check_dom_trust_pw(struct dcerpc_pipe *p,
+                              struct torture_context *tctx,
+                              const char *trusted_dom_name,
+                              const char *password)
+{
+       struct cli_credentials *credentials;
+       char *dummy;
+       struct netlogon_creds_CredentialState *creds;
+       struct dcerpc_pipe *pipe;
+       NTSTATUS status;
+       bool ok;
+
+       credentials = cli_credentials_init(tctx);
+       if (credentials == NULL) {
+               return false;
+       }
+
+       dummy = talloc_asprintf(tctx, "%s$", trusted_dom_name);
+       if (dummy == NULL) {
+               return false;
+       }
+
+       cli_credentials_set_username(credentials, dummy, CRED_SPECIFIED);
+       cli_credentials_set_password(credentials, password, CRED_SPECIFIED);
+       cli_credentials_set_workstation(credentials,
+                                       trusted_dom_name, CRED_SPECIFIED);
+       cli_credentials_set_secure_channel_type(credentials, SEC_CHAN_DOMAIN);
+
+       status = dcerpc_pipe_connect_b(tctx, &pipe, p->binding,
+                                      &ndr_table_netlogon,
+                                      cli_credentials_init_anon(tctx),
+                                      tctx->ev, tctx->lp_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               torture_comment(tctx, "dcerpc_pipe_connect_b failed.\n");
+               return false;
+       }
+
+       ok = check_pw_with_ServerAuthenticate3(pipe, tctx,
+                                              NETLOGON_NEG_AUTH2_ADS_FLAGS,
+                                              credentials, &creds);
+       talloc_free(pipe);
+
+       return ok;
+}
+
+static bool test_CreateTrustedDomainEx_common(struct dcerpc_pipe *p,
+                                             struct torture_context *tctx,
+                                             struct policy_handle *handle,
+                                             uint32_t num_trusts,
+                                             bool ex2_call)
 {
        NTSTATUS status;
        bool ret = true;
-       struct lsa_CreateTrustedDomainEx2 r;
+       struct lsa_CreateTrustedDomainEx r;
+       struct lsa_CreateTrustedDomainEx2 r2;
        struct lsa_TrustDomainInfoInfoEx trustinfo;
-       struct lsa_TrustDomainInfoAuthInfoInternal authinfo;
-       struct trustDomainPasswords auth_struct;
-       DATA_BLOB auth_blob;
-       struct dom_sid *domsid[12];
-       struct policy_handle trustdom_handle[12];
+       struct lsa_TrustDomainInfoAuthInfoInternal *authinfo_internal;
+       struct lsa_TrustDomainInfoAuthInfo *authinfo;
+       struct dom_sid **domsid;
+       struct policy_handle *trustdom_handle;
        struct lsa_QueryTrustedDomainInfo q;
        union lsa_TrustedDomainInfo *info = NULL;
        DATA_BLOB session_key;
-       enum ndr_err_code ndr_err;
        int i;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       torture_comment(tctx, "\nTesting CreateTrustedDomainEx2 for 12 domains\n");
+       if (ex2_call) {
+               torture_comment(tctx, "\nTesting CreateTrustedDomainEx2 for %d domains\n", num_trusts);
+       } else {
+               torture_comment(tctx, "\nTesting CreateTrustedDomainEx for %d domains\n", num_trusts);
+       }
+
+       domsid = talloc_array(tctx, struct dom_sid *, num_trusts);
+       trustdom_handle = talloc_array(tctx, struct policy_handle, num_trusts);
 
        status = dcerpc_fetch_session_key(p, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2262,7 +2652,7 @@ static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p,
                return false;
        }
 
-       for (i=0; i< 12; i++) {
+       for (i=0; i< num_trusts; i++) {
                char *trust_name = talloc_asprintf(tctx, "torturedom%02d", i);
                char *trust_name_dns = talloc_asprintf(tctx, "torturedom%02d.samba.example.com", i);
                char *trust_sid = talloc_asprintf(tctx, "S-1-5-21-97398-379795-100%02d", i);
@@ -2287,52 +2677,97 @@ static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p,
 
                trustinfo.trust_attributes = LSA_TRUST_ATTRIBUTE_USES_RC4_ENCRYPTION;
 
-               generate_random_buffer(auth_struct.confounder, sizeof(auth_struct.confounder));
-
-               auth_struct.outgoing.count = 0;
-               auth_struct.incoming.count = 0;
+               if (!gen_authinfo_internal(tctx, TRUSTPW, session_key, &authinfo_internal)) {
+                       torture_comment(tctx, "gen_authinfo_internal failed");
+                       ret = false;
+               }
 
-               ndr_err = ndr_push_struct_blob(&auth_blob, tctx, lp_iconv_convenience(tctx->lp_ctx), &auth_struct,
-                                              (ndr_push_flags_fn_t)ndr_push_trustDomainPasswords);
-               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       torture_comment(tctx, "ndr_push_struct_blob of trustDomainPasswords structure failed");
+               if (!gen_authinfo(tctx, TRUSTPW, &authinfo)) {
+                       torture_comment(tctx, "gen_authinfonfo failed");
                        ret = false;
                }
 
-               arcfour_crypt_blob(auth_blob.data, auth_blob.length, &session_key);
+               if (ex2_call) {
 
-               authinfo.auth_blob.size = auth_blob.length;
-               authinfo.auth_blob.data = auth_blob.data;
+                       r2.in.policy_handle = handle;
+                       r2.in.info = &trustinfo;
+                       r2.in.auth_info_internal = authinfo_internal;
+                       r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+                       r2.out.trustdom_handle = &trustdom_handle[i];
 
-               r.in.policy_handle = handle;
-               r.in.info = &trustinfo;
-               r.in.auth_info = &authinfo;
-               r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-               r.out.trustdom_handle = &trustdom_handle[i];
+                       torture_assert_ntstatus_ok(tctx,
+                               dcerpc_lsa_CreateTrustedDomainEx2_r(b, tctx, &r2),
+                               "CreateTrustedDomainEx2 failed");
+
+                       status = r2.out.result;
+               } else {
+
+                       r.in.policy_handle = handle;
+                       r.in.info = &trustinfo;
+                       r.in.auth_info = authinfo;
+                       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+                       r.out.trustdom_handle = &trustdom_handle[i];
+
+                       torture_assert_ntstatus_ok(tctx,
+                               dcerpc_lsa_CreateTrustedDomainEx_r(b, tctx, &r),
+                               "CreateTrustedDomainEx failed");
+
+                       status = r.out.result;
+               }
 
-               status = dcerpc_lsa_CreateTrustedDomainEx2(p, tctx, &r);
                if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-                       test_DeleteTrustedDomain(p, tctx, handle, trustinfo.netbios_name);
-                       status = dcerpc_lsa_CreateTrustedDomainEx2(p, tctx, &r);
+                       test_DeleteTrustedDomain(b, tctx, handle, trustinfo.netbios_name);
+                       if (ex2_call) {
+                               torture_assert_ntstatus_ok(tctx,
+                                       dcerpc_lsa_CreateTrustedDomainEx2_r(b, tctx, &r2),
+                                       "CreateTrustedDomainEx2 failed");
+                               status = r2.out.result;
+                       } else {
+                               torture_assert_ntstatus_ok(tctx,
+                                       dcerpc_lsa_CreateTrustedDomainEx_r(b, tctx, &r),
+                                       "CreateTrustedDomainEx2 failed");
+                               status = r.out.result;
+                       }
                }
                if (!NT_STATUS_IS_OK(status)) {
                        torture_comment(tctx, "CreateTrustedDomainEx failed2 - %s\n", nt_errstr(status));
                        ret = false;
                } else {
+                       /* For outbound and MIT trusts there is no trust account */
+                       if (trustinfo.trust_direction != 2 &&
+                           trustinfo.trust_type != 3) {
+
+                               if (torture_setting_bool(tctx, "samba3", false) ||
+                                   torture_setting_bool(tctx, "samba4", false)) {
+                                       torture_comment(tctx, "skipping trusted domain auth tests against samba");
+                               } else {
+                                       if (check_dom_trust_pw(p, tctx, trust_name,
+                                                               "x" TRUSTPW "x")) {
+                                               torture_comment(tctx, "Password check passed unexpectedly\n");
+                                               ret = false;
+                                       }
+                                       if (!check_dom_trust_pw(p, tctx, trust_name,
+                                                               TRUSTPW)) {
+                                               torture_comment(tctx, "Password check failed\n");
+                                               ret = false;
+                                       }
+                               }
+                       }
 
                        q.in.trustdom_handle = &trustdom_handle[i];
                        q.in.level = LSA_TRUSTED_DOMAIN_INFO_INFO_EX;
                        q.out.info = &info;
-                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, tctx, &q);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               torture_comment(tctx, "QueryTrustedDomainInfo level 1 failed - %s\n", nt_errstr(status));
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryTrustedDomainInfo_r(b, tctx, &q),
+                               "QueryTrustedDomainInfo failed");
+                       if (!NT_STATUS_IS_OK(q.out.result)) {
+                               torture_comment(tctx, "QueryTrustedDomainInfo level 1 failed - %s\n", nt_errstr(q.out.result));
                                ret = false;
                        } else if (!q.out.info) {
                                torture_comment(tctx, "QueryTrustedDomainInfo level 1 failed to return an info pointer\n");
                                ret = false;
                        } else {
                                if (strcmp(info->info_ex.netbios_name.string, trustinfo.netbios_name.string) != 0) {
-                                       torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n",
+                                       torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistent short name: %s != %s\n",
                                               info->info_ex.netbios_name.string, trustinfo.netbios_name.string);
                                        ret = false;
                                }
@@ -2356,18 +2791,18 @@ static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p,
        }
 
        /* now that we have some domains to look over, we can test the enum calls */
-       if (!test_EnumTrustDom(p, tctx, handle)) {
+       if (!test_EnumTrustDom(b, tctx, handle)) {
                torture_comment(tctx, "test_EnumTrustDom failed\n");
                ret = false;
        }
 
-       if (!test_EnumTrustDomEx(p, tctx, handle)) {
+       if (!test_EnumTrustDomEx(b, tctx, handle)) {
                torture_comment(tctx, "test_EnumTrustDomEx failed\n");
                ret = false;
        }
 
-       for (i=0; i<12; i++) {
-               if (!test_DeleteTrustedDomainBySid(p, tctx, handle, domsid[i])) {
+       for (i=0; i<num_trusts; i++) {
+               if (!test_DeleteTrustedDomainBySid(b, tctx, handle, domsid[i])) {
                        torture_comment(tctx, "test_DeleteTrustedDomainBySid failed\n");
                        ret = false;
                }
@@ -2376,16 +2811,35 @@ static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p,
        return ret;
 }
 
-static bool test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
+static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p,
+                                       struct torture_context *tctx,
+                                       struct policy_handle *handle,
+                                       uint32_t num_trusts)
+{
+       return test_CreateTrustedDomainEx_common(p, tctx, handle, num_trusts, true);
+}
+
+static bool test_CreateTrustedDomainEx(struct dcerpc_pipe *p,
+                                      struct torture_context *tctx,
+                                      struct policy_handle *handle,
+                                      uint32_t num_trusts)
+{
+       return test_CreateTrustedDomainEx_common(p, tctx, handle, num_trusts, false);
+}
+
+static bool test_QueryDomainInfoPolicy(struct dcerpc_binding_handle *b,
                                 struct torture_context *tctx,
                                 struct policy_handle *handle)
 {
        struct lsa_QueryDomainInformationPolicy r;
        union lsa_DomainInformationPolicy *info = NULL;
-       NTSTATUS status;
        int i;
        bool ret = true;
 
+       if (torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skipping QueryDomainInformationPolicy test\n");
+       }
+
        torture_comment(tctx, "\nTesting QueryDomainInformationPolicy\n");
 
        for (i=2;i<4;i++) {
@@ -2395,13 +2849,14 @@ static bool test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
 
                torture_comment(tctx, "\nTrying QueryDomainInformationPolicy level %d\n", i);
 
-               status = dcerpc_lsa_QueryDomainInformationPolicy(p, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryDomainInformationPolicy_r(b, tctx, &r),
+                       "QueryDomainInformationPolicy failed");
 
                /* If the server does not support EFS, then this is the correct return */
-               if (i == LSA_DOMAIN_INFO_POLICY_EFS && NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+               if (i == LSA_DOMAIN_INFO_POLICY_EFS && NT_STATUS_EQUAL(r.out.result, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
                        continue;
-               } else if (!NT_STATUS_IS_OK(status)) {
-                       torture_comment(tctx, "QueryDomainInformationPolicy failed - %s\n", nt_errstr(status));
+               } else if (!NT_STATUS_IS_OK(r.out.result)) {
+                       torture_comment(tctx, "QueryDomainInformationPolicy failed - %s\n", nt_errstr(r.out.result));
                        ret = false;
                        continue;
                }
@@ -2412,88 +2867,90 @@ static bool test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
 
 
 static bool test_QueryInfoPolicyCalls( bool version2,
-                                       struct dcerpc_pipe *p,
+                                       struct dcerpc_binding_handle *b,
                                        struct torture_context *tctx,
                                        struct policy_handle *handle)
 {
        struct lsa_QueryInfoPolicy r;
        union lsa_PolicyInformation *info = NULL;
-       NTSTATUS status;
        int i;
        bool ret = true;
+       const char *call = talloc_asprintf(tctx, "QueryInfoPolicy%s", version2 ? "2":"");
 
-       if (version2)
-               torture_comment(tctx, "\nTesting QueryInfoPolicy2\n");
-       else
-               torture_comment(tctx, "\nTesting QueryInfoPolicy\n");
+       torture_comment(tctx, "\nTesting %s\n", call);
+
+       if (version2 && torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skipping QueryInfoPolicy2 tests\n");
+       }
 
        for (i=1;i<=14;i++) {
                r.in.handle = handle;
                r.in.level = i;
                r.out.info = &info;
 
-               if (version2)
-                       torture_comment(tctx, "\nTrying QueryInfoPolicy2 level %d\n", i);
-               else
-                       torture_comment(tctx, "\nTrying QueryInfoPolicy level %d\n", i);
+               torture_comment(tctx, "\nTrying %s level %d\n", call, i);
 
                if (version2)
                        /* We can perform the cast, because both types are
                           structurally equal */
-                       status = dcerpc_lsa_QueryInfoPolicy2(p, tctx,
-                                (struct lsa_QueryInfoPolicy2*) &r);
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryInfoPolicy2_r(b, tctx,
+                                (struct lsa_QueryInfoPolicy2*) &r),
+                                "QueryInfoPolicy2 failed");
                else
-                       status = dcerpc_lsa_QueryInfoPolicy(p, tctx, &r);
+                       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_QueryInfoPolicy_r(b, tctx, &r),
+                               "QueryInfoPolicy2 failed");
 
                switch (i) {
                case LSA_POLICY_INFO_MOD:
                case LSA_POLICY_INFO_AUDIT_FULL_SET:
                case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
-                       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
-                               torture_comment(tctx, "Server should have failed level %u: %s\n", i, nt_errstr(status));
+                       if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_INVALID_PARAMETER)) {
+                               torture_comment(tctx, "Server should have failed level %u: %s\n", i, nt_errstr(r.out.result));
                                ret = false;
                        }
                        break;
                case LSA_POLICY_INFO_DOMAIN:
                case LSA_POLICY_INFO_ACCOUNT_DOMAIN:
-               case LSA_POLICY_INFO_L_ACCOUNT_DOMAIN:
-               case LSA_POLICY_INFO_DNS_INT:
-               case LSA_POLICY_INFO_DNS:
                case LSA_POLICY_INFO_REPLICA:
                case LSA_POLICY_INFO_QUOTA:
                case LSA_POLICY_INFO_ROLE:
                case LSA_POLICY_INFO_AUDIT_LOG:
                case LSA_POLICY_INFO_AUDIT_EVENTS:
                case LSA_POLICY_INFO_PD:
-                       if (!NT_STATUS_IS_OK(status)) {
-                               if (version2)
-                                       torture_comment(tctx, "QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                               else
-                                       torture_comment(tctx, "QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                       if (!NT_STATUS_IS_OK(r.out.result)) {
+                               torture_comment(tctx, "%s failed - %s\n", call, nt_errstr(r.out.result));
+                               ret = false;
+                       }
+                       break;
+               case LSA_POLICY_INFO_L_ACCOUNT_DOMAIN:
+               case LSA_POLICY_INFO_DNS_INT:
+               case LSA_POLICY_INFO_DNS:
+                       if (torture_setting_bool(tctx, "samba3", false)) {
+                               /* Other levels not implemented yet */
+                               if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_INVALID_INFO_CLASS)) {
+                                       torture_comment(tctx, "%s failed - %s\n", call, nt_errstr(r.out.result));
+                                       ret = false;
+                               }
+                       } else if (!NT_STATUS_IS_OK(r.out.result)) {
+                               torture_comment(tctx, "%s failed - %s\n", call, nt_errstr(r.out.result));
                                ret = false;
                        }
                        break;
                default:
                        if (torture_setting_bool(tctx, "samba4", false)) {
                                /* Other levels not implemented yet */
-                               if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)) {
-                                       if (version2)
-                                               torture_comment(tctx, "QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                                       else
-                                               torture_comment(tctx, "QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                               if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_INVALID_INFO_CLASS)) {
+                                       torture_comment(tctx, "%s failed - %s\n", call, nt_errstr(r.out.result));
                                        ret = false;
                                }
-                       } else if (!NT_STATUS_IS_OK(status)) {
-                               if (version2)
-                                       torture_comment(tctx, "QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                               else
-                                       torture_comment(tctx, "QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                       } else if (!NT_STATUS_IS_OK(r.out.result)) {
+                               torture_comment(tctx, "%s failed - %s\n", call, nt_errstr(r.out.result));
                                ret = false;
                        }
                        break;
                }
 
-               if (NT_STATUS_IS_OK(status) && (i == LSA_POLICY_INFO_DNS
+               if (NT_STATUS_IS_OK(r.out.result) && (i == LSA_POLICY_INFO_DNS
                        || i == LSA_POLICY_INFO_DNS_INT)) {
                        /* Let's look up some of these names */
 
@@ -2528,7 +2985,7 @@ static bool test_QueryInfoPolicyCalls(    bool version2,
                        tnames.names[12].sid_type = SID_NAME_USER;
                        tnames.names[13].name.string = talloc_asprintf(tctx, TEST_MACHINENAME "$@%s", info->dns.dns_domain.string);
                        tnames.names[13].sid_type = SID_NAME_USER;
-                       ret &= test_LookupNames(p, tctx, handle, &tnames);
+                       ret &= test_LookupNames(b, tctx, handle, &tnames);
 
                }
        }
@@ -2536,25 +2993,24 @@ static bool test_QueryInfoPolicyCalls(  bool version2,
        return ret;
 }
 
-static bool test_QueryInfoPolicy(struct dcerpc_pipe *p,
+static bool test_QueryInfoPolicy(struct dcerpc_binding_handle *b,
                                 struct torture_context *tctx,
                                 struct policy_handle *handle)
 {
-       return test_QueryInfoPolicyCalls(false, p, tctx, handle);
+       return test_QueryInfoPolicyCalls(false, b, tctx, handle);
 }
 
-static bool test_QueryInfoPolicy2(struct dcerpc_pipe *p,
+static bool test_QueryInfoPolicy2(struct dcerpc_binding_handle *b,
                                  struct torture_context *tctx,
                                  struct policy_handle *handle)
 {
-       return test_QueryInfoPolicyCalls(true, p, tctx, handle);
+       return test_QueryInfoPolicyCalls(true, b, tctx, handle);
 }
 
-static bool test_GetUserName(struct dcerpc_pipe *p,
+static bool test_GetUserName(struct dcerpc_binding_handle *b,
                             struct torture_context *tctx)
 {
        struct lsa_GetUserName r;
-       NTSTATUS status;
        bool ret = true;
        struct lsa_String *authority_name_p = NULL;
        struct lsa_String *account_name_p = NULL;
@@ -2566,10 +3022,11 @@ static bool test_GetUserName(struct dcerpc_pipe *p,
        r.in.authority_name     = NULL;
        r.out.account_name      = &account_name_p;
 
-       status = dcerpc_lsa_GetUserName(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_GetUserName_r(b, tctx, &r),
+               "GetUserName failed");
 
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "GetUserName failed - %s\n", nt_errstr(status));
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "GetUserName failed - %s\n", nt_errstr(r.out.result));
                ret = false;
        }
 
@@ -2578,21 +3035,21 @@ static bool test_GetUserName(struct dcerpc_pipe *p,
        r.in.authority_name     = &authority_name_p;
        r.out.account_name      = &account_name_p;
 
-       status = dcerpc_lsa_GetUserName(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_GetUserName_r(b, tctx, &r),
+               "GetUserName failed");
 
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "GetUserName failed - %s\n", nt_errstr(status));
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "GetUserName failed - %s\n", nt_errstr(r.out.result));
                ret = false;
        }
 
        return ret;
 }
 
-bool test_lsa_Close(struct dcerpc_pipe *p,
+bool test_lsa_Close(struct dcerpc_binding_handle *b,
                    struct torture_context *tctx,
                    struct policy_handle *handle)
 {
-       NTSTATUS status;
        struct lsa_Close r;
        struct policy_handle handle2;
 
@@ -2601,18 +3058,16 @@ bool test_lsa_Close(struct dcerpc_pipe *p,
        r.in.handle = handle;
        r.out.handle = &handle2;
 
-       status = dcerpc_lsa_Close(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               torture_comment(tctx, "Close failed - %s\n", nt_errstr(status));
+       torture_assert_ntstatus_ok(tctx, dcerpc_lsa_Close_r(b, tctx, &r),
+               "Close failed");
+       if (!NT_STATUS_IS_OK(r.out.result)) {
+               torture_comment(tctx, "Close failed - %s\n",
+               nt_errstr(r.out.result));
                return false;
        }
 
-       status = dcerpc_lsa_Close(p, tctx, &r);
-       /* its really a fault - we need a status code for rpc fault */
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
-               torture_comment(tctx, "Close failed - %s\n", nt_errstr(status));
-               return false;
-       }
+       torture_assert_ntstatus_equal(tctx, dcerpc_lsa_Close_r(b, tctx, &r),
+               NT_STATUS_RPC_SS_CONTEXT_MISMATCH, "Close should failed");
 
        torture_comment(tctx, "\n");
 
@@ -2627,17 +3082,19 @@ bool torture_rpc_lsa(struct torture_context *tctx)
        struct policy_handle *handle;
        struct test_join *join = NULL;
        struct cli_credentials *machine_creds;
+       struct dcerpc_binding_handle *b;
 
        status = torture_rpc_connection(tctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
+       b = p->binding_handle;
 
-       if (!test_OpenPolicy(p, tctx)) {
+       if (!test_OpenPolicy(b, tctx)) {
                ret = false;
        }
 
-       if (!test_lsa_OpenPolicy2(p, tctx, &handle)) {
+       if (!test_lsa_OpenPolicy2(b, tctx, &handle)) {
                ret = false;
        }
 
@@ -2647,11 +3104,11 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                        ret = false;
                }
 
-               if (!test_LookupSids_async(p, tctx, handle)) {
+               if (!test_LookupSids_async(b, tctx, handle)) {
                        ret = false;
                }
 
-               if (!test_QueryDomainInfoPolicy(p, tctx, handle)) {
+               if (!test_QueryDomainInfoPolicy(b, tctx, handle)) {
                        ret = false;
                }
 
@@ -2659,15 +3116,15 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                        ret = false;
                }
 
-               if (!test_QueryInfoPolicy(p, tctx, handle)) {
+               if (!test_QueryInfoPolicy(b, tctx, handle)) {
                        ret = false;
                }
 
-               if (!test_QueryInfoPolicy2(p, tctx, handle)) {
+               if (!test_QueryInfoPolicy2(b, tctx, handle)) {
                        ret = false;
                }
 
-               if (!test_Delete(p, tctx, handle)) {
+               if (!test_Delete(b, tctx, handle)) {
                        ret = false;
                }
 
@@ -2675,7 +3132,7 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                        ret = false;
                }
 
-               if (!test_lsa_Close(p, tctx, handle)) {
+               if (!test_lsa_Close(b, tctx, handle)) {
                        ret = false;
                }
 
@@ -2687,7 +3144,7 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                }
        }
 
-       if (!test_GetUserName(p, tctx)) {
+       if (!test_GetUserName(b, tctx)) {
                ret = false;
        }
 
@@ -2699,13 +3156,15 @@ bool torture_rpc_lsa_get_user(struct torture_context *tctx)
         NTSTATUS status;
         struct dcerpc_pipe *p;
        bool ret = true;
+       struct dcerpc_binding_handle *b;
 
        status = torture_rpc_connection(tctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
+       b = p->binding_handle;
 
-       if (!test_GetUserName(p, tctx)) {
+       if (!test_GetUserName(b, tctx)) {
                ret = false;
        }
 
@@ -2719,12 +3178,13 @@ static bool testcase_LookupNames(struct torture_context *tctx,
        struct policy_handle *handle;
        struct lsa_TransNameArray tnames;
        struct lsa_TransNameArray2 tnames2;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       if (!test_OpenPolicy(p, tctx)) {
+       if (!test_OpenPolicy(b, tctx)) {
                ret = false;
        }
 
-       if (!test_lsa_OpenPolicy2(p, tctx, &handle)) {
+       if (!test_lsa_OpenPolicy2(b, tctx, &handle)) {
                ret = false;
        }
 
@@ -2738,7 +3198,7 @@ static bool testcase_LookupNames(struct torture_context *tctx,
        tnames.names[0].name.string = "BUILTIN";
        tnames.names[0].sid_type = SID_NAME_DOMAIN;
 
-       if (!test_LookupNames(p, tctx, handle, &tnames)) {
+       if (!test_LookupNames(b, tctx, handle, &tnames)) {
                ret = false;
        }
 
@@ -2748,23 +3208,27 @@ static bool testcase_LookupNames(struct torture_context *tctx,
        tnames2.names[0].name.string = "BUILTIN";
        tnames2.names[0].sid_type = SID_NAME_DOMAIN;
 
-       if (!test_LookupNames2(p, tctx, handle, &tnames2, true)) {
+       if (!test_LookupNames2(b, tctx, handle, &tnames2, true)) {
+               ret = false;
+       }
+
+       if (!test_LookupNames3(b, tctx, handle, &tnames2, true)) {
                ret = false;
        }
 
-       if (!test_LookupNames3(p, tctx, handle, &tnames2, true)) {
+       if (!test_LookupNames_wellknown(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_LookupNames_wellknown(p, tctx, handle)) {
+       if (!test_LookupNames_NULL(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_LookupNames_bogus(p, tctx, handle)) {
+       if (!test_LookupNames_bogus(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_lsa_Close(p, tctx, handle)) {
+       if (!test_lsa_Close(b, tctx, handle)) {
                ret = false;
        }
 
@@ -2776,7 +3240,7 @@ struct torture_suite *torture_rpc_lsa_lookup_names(TALLOC_CTX *mem_ctx)
        struct torture_suite *suite;
        struct torture_rpc_tcase *tcase;
 
-       suite = torture_suite_create(mem_ctx, "LSA-LOOKUPNAMES");
+       suite = torture_suite_create(mem_ctx, "lsa.lookupnames");
 
        tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
                                                  &ndr_table_lsarpc);
@@ -2786,17 +3250,27 @@ struct torture_suite *torture_rpc_lsa_lookup_names(TALLOC_CTX *mem_ctx)
        return suite;
 }
 
+struct lsa_trustdom_state {
+       uint32_t num_trusts;
+};
+
 static bool testcase_TrustedDomains(struct torture_context *tctx,
-                                   struct dcerpc_pipe *p)
+                                   struct dcerpc_pipe *p,
+                                   void *data)
 {
        bool ret = true;
        struct policy_handle *handle;
+       struct lsa_trustdom_state *state =
+               talloc_get_type_abort(data, struct lsa_trustdom_state);
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       if (!test_OpenPolicy(p, tctx)) {
+       torture_comment(tctx, "Testing %d domains\n", state->num_trusts);
+
+       if (!test_OpenPolicy(b, tctx)) {
                ret = false;
        }
 
-       if (!test_lsa_OpenPolicy2(p, tctx, &handle)) {
+       if (!test_lsa_OpenPolicy2(b, tctx, &handle)) {
                ret = false;
        }
 
@@ -2804,15 +3278,19 @@ static bool testcase_TrustedDomains(struct torture_context *tctx,
                ret = false;
        }
 
-       if (!test_CreateTrustedDomain(p, tctx, handle)) {
+       if (!test_CreateTrustedDomain(b, tctx, handle, state->num_trusts)) {
                ret = false;
        }
 
-       if (!test_CreateTrustedDomainEx2(p, tctx, handle)) {
+       if (!test_CreateTrustedDomainEx(p, tctx, handle, state->num_trusts)) {
                ret = false;
        }
 
-       if (!test_lsa_Close(p, tctx, handle)) {
+       if (!test_CreateTrustedDomainEx2(p, tctx, handle, state->num_trusts)) {
+               ret = false;
+       }
+
+       if (!test_lsa_Close(b, tctx, handle)) {
                ret = false;
        }
 
@@ -2823,13 +3301,19 @@ struct torture_suite *torture_rpc_lsa_trusted_domains(TALLOC_CTX *mem_ctx)
 {
        struct torture_suite *suite;
        struct torture_rpc_tcase *tcase;
+       struct lsa_trustdom_state *state;
+
+       state = talloc(mem_ctx, struct lsa_trustdom_state);
+
+       state->num_trusts = 12;
 
-       suite = torture_suite_create(mem_ctx, "LSA-TRUSTED-DOMAINS");
+       suite = torture_suite_create(mem_ctx, "lsa.trusted.domains");
 
        tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
                                                  &ndr_table_lsarpc);
-       torture_rpc_tcase_add_test(tcase, "TrustedDomains",
-                                  testcase_TrustedDomains);
+       torture_rpc_tcase_add_test_ex(tcase, "TrustedDomains",
+                                     testcase_TrustedDomains,
+                                     state);
 
        return suite;
 }
@@ -2839,12 +3323,13 @@ static bool testcase_Privileges(struct torture_context *tctx,
 {
        bool ret = true;
        struct policy_handle *handle;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       if (!test_OpenPolicy(p, tctx)) {
+       if (!test_OpenPolicy(b, tctx)) {
                ret = false;
        }
 
-       if (!test_lsa_OpenPolicy2(p, tctx, &handle)) {
+       if (!test_lsa_OpenPolicy2(b, tctx, &handle)) {
                ret = false;
        }
 
@@ -2852,19 +3337,19 @@ static bool testcase_Privileges(struct torture_context *tctx,
                ret = false;
        }
 
-       if (!test_CreateAccount(p, tctx, handle)) {
+       if (!test_CreateAccount(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_EnumAccounts(p, tctx, handle)) {
+       if (!test_EnumAccounts(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_EnumPrivs(p, tctx, handle)) {
+       if (!test_EnumPrivs(b, tctx, handle)) {
                ret = false;
        }
 
-       if (!test_lsa_Close(p, tctx, handle)) {
+       if (!test_lsa_Close(b, tctx, handle)) {
                ret = false;
        }
 
@@ -2877,7 +3362,7 @@ struct torture_suite *torture_rpc_lsa_privileges(TALLOC_CTX *mem_ctx)
        struct torture_suite *suite;
        struct torture_rpc_tcase *tcase;
 
-       suite = torture_suite_create(mem_ctx, "LSA-PRIVILEGES");
+       suite = torture_suite_create(mem_ctx, "lsa.privileges");
 
        tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
                                                  &ndr_table_lsarpc);