s4-smbtorture: use struct torture_context in RPC-LSA.
[ira/wip.git] / source4 / torture / rpc / lsa.c
index 04d13a97c1c51849bede4a85af95a75bbf040238..038757e9bf08d949f43e98f9b7ce7973c20b5025 100644 (file)
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/netlogon.h"
+#include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "lib/events/events.h"
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
-
+#include "../lib/crypto/crypto.h"
 #define TEST_MACHINENAME "lsatestmach"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
@@ -36,7 +37,8 @@ static void init_lsa_String(struct lsa_String *name, const char *s)
        name->string = s;
 }
 
-static bool test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool test_OpenPolicy(struct dcerpc_pipe *p,
+                           struct torture_context *tctx)
 {
        struct lsa_ObjectAttribute attr;
        struct policy_handle handle;
@@ -45,7 +47,7 @@ static bool test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        NTSTATUS status;
        uint16_t system_name = '\\';
 
-       printf("\ntesting OpenPolicy\n");
+       printf("\nTesting OpenPolicy\n");
 
        qos.len = 0;
        qos.impersonation_level = 2;
@@ -64,7 +66,7 @@ static bool test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = &handle;
 
-       status = dcerpc_lsa_OpenPolicy(p, mem_ctx, &r);
+       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)) {
@@ -79,7 +81,8 @@ static bool test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
-bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p,
+                         struct torture_context *tctx,
                          struct policy_handle **handle)
 {
        struct lsa_ObjectAttribute attr;
@@ -87,9 +90,9 @@ bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct lsa_OpenPolicy2 r;
        NTSTATUS status;
 
-       printf("\ntesting OpenPolicy2\n");
+       printf("\nTesting OpenPolicy2\n");
 
-       *handle = talloc(mem_ctx, struct policy_handle);
+       *handle = talloc(tctx, struct policy_handle);
        if (!*handle) {
                return false;
        }
@@ -111,7 +114,7 @@ bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = *handle;
 
-       status = dcerpc_lsa_OpenPolicy2(p, mem_ctx, &r);
+       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)) {
@@ -146,12 +149,13 @@ static const char *sid_type_lookup(enum lsa_SidType r)
 }
 
 static bool test_LookupNames(struct dcerpc_pipe *p, 
-                            TALLOC_CTX *mem_ctx, 
+                            struct torture_context *tctx,
                             struct policy_handle *handle,
                             struct lsa_TransNameArray *tnames)
 {
        struct lsa_LookupNames r;
        struct lsa_TransSidArray sids;
+       struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
        NTSTATUS status;
@@ -162,7 +166,7 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc_array(mem_ctx, struct lsa_String, 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);
        }
@@ -175,8 +179,9 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
        r.in.count = &count;
        r.out.count = &count;
        r.out.sids = &sids;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupNames(p, tctx, &r);
 
        if (NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) || 
            NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
@@ -210,30 +215,32 @@ static bool test_LookupNames(struct dcerpc_pipe *p,
        return true;
 }
 
-static bool test_LookupNames_bogus(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *handle)
+static bool test_LookupNames_bogus(struct dcerpc_pipe *p,
+                                  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;
        uint32_t count = 0;
        NTSTATUS status;
        int i;
 
-       struct lsa_TranslatedName name;
+       struct lsa_TranslatedName name[2];
        struct lsa_TransNameArray tnames;
 
-       tnames.names = &name;
-       tnames.count = 1;
-       name.name.string = "NT AUTHORITY\\BOGUS";
+       tnames.names = name;
+       tnames.count = 2;
+       name[0].name.string = "NT AUTHORITY\\BOGUS";
+       name[1].name.string = NULL;
 
        printf("\nTesting LookupNames with bogus names\n");
 
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc_array(mem_ctx, struct lsa_String, 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);
        }
@@ -246,8 +253,9 @@ static bool test_LookupNames_bogus(struct dcerpc_pipe *p,
        r.in.count = &count;
        r.out.count = &count;
        r.out.sids = &sids;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupNames(p, tctx, &r);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
                printf("LookupNames failed - %s\n", nt_errstr(status));
                return false;
@@ -259,7 +267,7 @@ static bool test_LookupNames_bogus(struct dcerpc_pipe *p,
 }
 
 static bool test_LookupNames_wellknown(struct dcerpc_pipe *p, 
-                                      TALLOC_CTX *mem_ctx, 
+                                      struct torture_context *tctx,
                                       struct policy_handle *handle)
 {
        struct lsa_TranslatedName name;
@@ -272,49 +280,50 @@ 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, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
        name.name.string = "NT AUTHORITY\\ANONYMOUS LOGON";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
        name.name.string = "NT AUTHORITY\\Authenticated Users";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
 #if 0
        name.name.string = "NT AUTHORITY";
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
        name.name.string = "NT AUTHORITY\\";
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 #endif
 
        name.name.string = "BUILTIN\\";
        name.sid_type = SID_NAME_DOMAIN;
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
        name.name.string = "BUILTIN\\Administrators";
        name.sid_type = SID_NAME_ALIAS;
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
        name.name.string = "SYSTEM";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
 
        name.name.string = "Everyone";
        name.sid_type = SID_NAME_WKN_GRP;
-       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       ret &= test_LookupNames(p, tctx, handle, &tnames);
        return ret;
 }
 
 static bool test_LookupNames2(struct dcerpc_pipe *p, 
-                             TALLOC_CTX *mem_ctx, 
+                             struct torture_context *tctx,
                              struct policy_handle *handle,
                              struct lsa_TransNameArray2 *tnames)
 {
        struct lsa_LookupNames2 r;
        struct lsa_TransSidArray2 sids;
+       struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
        NTSTATUS status;
@@ -325,7 +334,7 @@ static bool test_LookupNames2(struct dcerpc_pipe *p,
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc_array(mem_ctx, struct lsa_String, 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);
        }
@@ -336,12 +345,13 @@ static bool test_LookupNames2(struct dcerpc_pipe *p,
        r.in.sids = &sids;
        r.in.level = 1;
        r.in.count = &count;
-       r.in.unknown1 = 0;
-       r.in.unknown2 = 0;
+       r.in.lookup_options = 0;
+       r.in.client_revision = 0;
        r.out.count = &count;
        r.out.sids = &sids;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames2(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupNames2(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupNames2 failed - %s\n", nt_errstr(status));
                return false;
@@ -354,12 +364,13 @@ static bool test_LookupNames2(struct dcerpc_pipe *p,
 
 
 static bool test_LookupNames3(struct dcerpc_pipe *p, 
-                             TALLOC_CTX *mem_ctx, 
+                             struct torture_context *tctx,
                              struct policy_handle *handle,
                              struct lsa_TransNameArray2 *tnames)
 {
        struct lsa_LookupNames3 r;
        struct lsa_TransSidArray3 sids;
+       struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
        NTSTATUS status;
@@ -370,7 +381,7 @@ static bool test_LookupNames3(struct dcerpc_pipe *p,
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc_array(mem_ctx, struct lsa_String, 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);
        }
@@ -381,12 +392,13 @@ static bool test_LookupNames3(struct dcerpc_pipe *p,
        r.in.sids = &sids;
        r.in.level = 1;
        r.in.count = &count;
-       r.in.unknown1 = 0;
-       r.in.unknown2 = 0;
+       r.in.lookup_options = 0;
+       r.in.client_revision = 0;
        r.out.count = &count;
        r.out.sids = &sids;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames3(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupNames3(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupNames3 failed - %s\n", nt_errstr(status));
                return false;
@@ -398,11 +410,12 @@ static bool test_LookupNames3(struct dcerpc_pipe *p,
 }
 
 static bool test_LookupNames4(struct dcerpc_pipe *p, 
-                             TALLOC_CTX *mem_ctx, 
+                             struct torture_context *tctx,
                              struct lsa_TransNameArray2 *tnames)
 {
        struct lsa_LookupNames4 r;
        struct lsa_TransSidArray3 sids;
+       struct lsa_RefDomainList *domains = NULL;
        struct lsa_String *names;
        uint32_t count = 0;
        NTSTATUS status;
@@ -413,7 +426,7 @@ static bool test_LookupNames4(struct dcerpc_pipe *p,
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc_array(mem_ctx, struct lsa_String, 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);
        }
@@ -423,12 +436,13 @@ static bool test_LookupNames4(struct dcerpc_pipe *p,
        r.in.sids = &sids;
        r.in.level = 1;
        r.in.count = &count;
-       r.in.unknown1 = 0;
-       r.in.unknown2 = 0;
+       r.in.lookup_options = 0;
+       r.in.client_revision = 0;
        r.out.count = &count;
        r.out.sids = &sids;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupNames4(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupNames4(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupNames4 failed - %s\n", nt_errstr(status));
                return false;
@@ -441,12 +455,13 @@ static bool test_LookupNames4(struct dcerpc_pipe *p,
 
 
 static bool test_LookupSids(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
+                           struct torture_context *tctx,
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
 {
        struct lsa_LookupSids r;
        struct lsa_TransNameArray names;
+       struct lsa_RefDomainList *domains = NULL;
        uint32_t count = sids->num_sids;
        NTSTATUS status;
 
@@ -462,8 +477,9 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
        r.in.count = &count;
        r.out.count = &count;
        r.out.names = &names;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupSids(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupSids failed - %s\n", nt_errstr(status));
                return false;
@@ -471,7 +487,7 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
 
        printf("\n");
 
-       if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+       if (!test_LookupNames(p, tctx, handle, &names)) {
                return false;
        }
 
@@ -480,12 +496,13 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
 
 
 static bool test_LookupSids2(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
+                           struct torture_context *tctx,
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
 {
        struct lsa_LookupSids2 r;
        struct lsa_TransNameArray2 names;
+       struct lsa_RefDomainList *domains = NULL;
        uint32_t count = sids->num_sids;
        NTSTATUS status;
 
@@ -503,8 +520,9 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
        r.in.unknown2 = 0;
        r.out.count = &count;
        r.out.names = &names;
+       r.out.domains = &domains;
 
-       status = dcerpc_lsa_LookupSids2(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupSids2(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupSids2 failed - %s\n", nt_errstr(status));
                return false;
@@ -512,11 +530,11 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
 
        printf("\n");
 
-       if (!test_LookupNames2(p, mem_ctx, handle, &names)) {
+       if (!test_LookupNames2(p, tctx, handle, &names)) {
                return false;
        }
 
-       if (!test_LookupNames3(p, mem_ctx, handle, &names)) {
+       if (!test_LookupNames3(p, tctx, handle, &names)) {
                return false;
        }
 
@@ -524,11 +542,12 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
 }
 
 static bool test_LookupSids3(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
+                           struct torture_context *tctx,
                            struct lsa_SidArray *sids)
 {
        struct lsa_LookupSids3 r;
        struct lsa_TransNameArray2 names;
+       struct lsa_RefDomainList *domains = NULL;
        uint32_t count = sids->num_sids;
        NTSTATUS status;
 
@@ -543,10 +562,11 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
        r.in.count = &count;
        r.in.unknown1 = 0;
        r.in.unknown2 = 0;
+       r.out.domains = &domains;
        r.out.count = &count;
        r.out.names = &names;
 
-       status = dcerpc_lsa_LookupSids3(p, mem_ctx, &r);
+       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)) {
@@ -560,7 +580,7 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
 
        printf("\n");
 
-       if (!test_LookupNames4(p, mem_ctx, &names)) {
+       if (!test_LookupNames4(p, tctx, &names)) {
                return false;
        }
 
@@ -568,7 +588,7 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
 }
 
 bool test_many_LookupSids(struct dcerpc_pipe *p, 
-                         TALLOC_CTX *mem_ctx, 
+                         struct torture_context *tctx,
                          struct policy_handle *handle)
 {
        uint32_t count;
@@ -580,11 +600,11 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
 
        sids.num_sids = 100;
 
-       sids.sids = talloc_array(mem_ctx, struct lsa_SidPtr, sids.num_sids);
+       sids.sids = talloc_array(tctx, struct lsa_SidPtr, sids.num_sids);
 
        for (i=0; i<sids.num_sids; i++) {
                const char *sidstr = "S-1-5-32-545";
-               sids.sids[i].sid = dom_sid_parse_talloc(mem_ctx, sidstr);
+               sids.sids[i].sid = dom_sid_parse_talloc(tctx, sidstr);
        }
 
        count = sids.num_sids;
@@ -592,6 +612,7 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
        if (handle) {
                struct lsa_LookupSids r;
                struct lsa_TransNameArray names;
+               struct lsa_RefDomainList *domains = NULL;
                names.count = 0;
                names.names = NULL;
 
@@ -602,8 +623,9 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                r.in.count = &names.count;
                r.out.count = &count;
                r.out.names = &names;
+               r.out.domains = &domains;
                
-               status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
+               status = dcerpc_lsa_LookupSids(p, tctx, &r);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("LookupSids failed - %s\n", nt_errstr(status));
                        return false;
@@ -611,11 +633,13 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                
                printf("\n");
                
-               if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+               if (!test_LookupNames(p, tctx, handle, &names)) {
                        return false;
                }
-       } else {
+       } 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) {
                struct lsa_LookupSids3 r;
+               struct lsa_RefDomainList *domains = NULL;
                struct lsa_TransNameArray2 names;
 
                names.count = 0;
@@ -631,8 +655,9 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                r.in.unknown2 = 0;
                r.out.count = &count;
                r.out.names = &names;
+               r.out.domains = &domains;
                
-               status = dcerpc_lsa_LookupSids3(p, mem_ctx, &r);
+               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)) {
@@ -643,7 +668,7 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
                               nt_errstr(status));
                        return false;
                }
-               if (!test_LookupNames4(p, mem_ctx, &names)) {
+               if (!test_LookupNames4(p, tctx, &names)) {
                        return false;
                }
        }
@@ -671,8 +696,8 @@ static void lookupsids_cb(struct rpc_request *req)
        }
 }
 
-static bool test_LookupSids_async(struct dcerpc_pipe *p, 
-                                 TALLOC_CTX *mem_ctx, 
+static bool test_LookupSids_async(struct dcerpc_pipe *p,
+                                 struct torture_context *tctx,
                                  struct policy_handle *handle)
 {
        struct lsa_SidArray sids;
@@ -680,22 +705,23 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
        uint32_t *count;
        struct lsa_TransNameArray *names;
        struct lsa_LookupSids *r;
+       struct lsa_RefDomainList *domains = NULL;
        struct rpc_request **req;
        int i, replies;
        bool ret = true;
        const int num_async_requests = 50;
 
-       count = talloc_array(mem_ctx, uint32_t, num_async_requests);
-       names = talloc_array(mem_ctx, struct lsa_TransNameArray, num_async_requests);
-       r = talloc_array(mem_ctx, struct lsa_LookupSids, num_async_requests);
+       count = talloc_array(tctx, uint32_t, num_async_requests);
+       names = talloc_array(tctx, struct lsa_TransNameArray, num_async_requests);
+       r = talloc_array(tctx, struct lsa_LookupSids, num_async_requests);
 
        printf("\nTesting %d async lookupsids request\n", num_async_requests);
 
-       req = talloc_array(mem_ctx, struct rpc_request *, num_async_requests);
+       req = talloc_array(tctx, struct rpc_request *, num_async_requests);
 
        sids.num_sids = 1;
        sids.sids = &sidptr;
-       sidptr.sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-545");
+       sidptr.sid = dom_sid_parse_talloc(tctx, "S-1-5-32-545");
 
        replies = 0;
 
@@ -711,6 +737,7 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
                r[i].in.count = &names[i].count;
                r[i].out.count = &count[i];
                r[i].out.names = &names[i];
+               r[i].out.domains = &domains;
                
                req[i] = dcerpc_lsa_LookupSids_send(p, req, &r[i]);
                if (req[i] == NULL) {
@@ -736,7 +763,7 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
 }
 
 static bool test_LookupPrivValue(struct dcerpc_pipe *p, 
-                                TALLOC_CTX *mem_ctx, 
+                                struct torture_context *tctx,
                                 struct policy_handle *handle,
                                 struct lsa_String *name)
 {
@@ -748,7 +775,7 @@ static bool test_LookupPrivValue(struct dcerpc_pipe *p,
        r.in.name = name;
        r.out.luid = &luid;
 
-       status = dcerpc_lsa_LookupPrivValue(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupPrivValue(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("\nLookupPrivValue failed - %s\n", nt_errstr(status));
                return false;
@@ -758,17 +785,19 @@ static bool test_LookupPrivValue(struct dcerpc_pipe *p,
 }
 
 static bool test_LookupPrivName(struct dcerpc_pipe *p, 
-                               TALLOC_CTX *mem_ctx, 
+                               struct torture_context *tctx,
                                struct policy_handle *handle,
                                struct lsa_LUID *luid)
 {
        NTSTATUS status;
        struct lsa_LookupPrivName r;
+       struct lsa_StringLarge *name = NULL;
 
        r.in.handle = handle;
        r.in.luid = luid;
+       r.out.name = &name;
 
-       status = dcerpc_lsa_LookupPrivName(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupPrivName(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("\nLookupPrivName failed - %s\n", nt_errstr(status));
                return false;
@@ -778,7 +807,8 @@ static bool test_LookupPrivName(struct dcerpc_pipe *p,
 }
 
 static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p, 
-                                            TALLOC_CTX *mem_ctx,                                 
+                                            struct torture_context *tctx,
+                                            struct policy_handle *handle,
                                             struct policy_handle *acct_handle,
                                             struct lsa_LUID *luid)
 {
@@ -787,7 +817,7 @@ static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
        struct lsa_PrivilegeSet privs;
        bool ret = true;
 
-       printf("Testing RemovePrivilegesFromAccount\n");
+       printf("\nTesting RemovePrivilegesFromAccount\n");
 
        r.in.handle = acct_handle;
        r.in.remove_all = 0;
@@ -795,13 +825,33 @@ static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
 
        privs.count = 1;
        privs.unknown = 0;
-       privs.set = talloc_array(mem_ctx, struct lsa_LUIDAttribute, 1);
+       privs.set = talloc_array(tctx, struct lsa_LUIDAttribute, 1);
        privs.set[0].luid = *luid;
        privs.set[0].attribute = 0;
 
-       status = dcerpc_lsa_RemovePrivilegesFromAccount(p, mem_ctx, &r);
+       status = dcerpc_lsa_RemovePrivilegesFromAccount(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("RemovePrivilegesFromAccount failed - %s\n", nt_errstr(status));
+               
+               struct lsa_LookupPrivName r_name;
+               struct lsa_StringLarge *name = NULL;
+               
+               r_name.in.handle = handle;
+               r_name.in.luid = luid;
+               r_name.out.name = &name;
+
+               status = dcerpc_lsa_LookupPrivName(p, tctx, &r_name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("\nLookupPrivName failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+               /* Windows 2008 does not allow this to be removed */
+               if (strcmp("SeAuditPrivilege", name->string) == 0) {
+                       return ret;
+               }
+
+               printf("RemovePrivilegesFromAccount failed to remove %s - %s\n", 
+                      name->string,
+                      nt_errstr(status));
                return false;
        }
 
@@ -809,7 +859,7 @@ static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
 }
 
 static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p, 
-                                       TALLOC_CTX *mem_ctx,                              
+                                       struct torture_context *tctx,
                                        struct policy_handle *acct_handle,
                                        struct lsa_LUID *luid)
 {
@@ -818,18 +868,18 @@ static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p,
        struct lsa_PrivilegeSet privs;
        bool ret = true;
 
-       printf("Testing AddPrivilegesToAccount\n");
+       printf("\nTesting AddPrivilegesToAccount\n");
 
        r.in.handle = acct_handle;
        r.in.privs = &privs;
 
        privs.count = 1;
        privs.unknown = 0;
-       privs.set = talloc_array(mem_ctx, struct lsa_LUIDAttribute, 1);
+       privs.set = talloc_array(tctx, struct lsa_LUIDAttribute, 1);
        privs.set[0].luid = *luid;
        privs.set[0].attribute = 0;
 
-       status = dcerpc_lsa_AddPrivilegesToAccount(p, mem_ctx, &r);
+       status = dcerpc_lsa_AddPrivilegesToAccount(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("AddPrivilegesToAccount failed - %s\n", nt_errstr(status));
                return false;
@@ -839,53 +889,129 @@ static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p,
 }
 
 static bool test_EnumPrivsAccount(struct dcerpc_pipe *p, 
-                                 TALLOC_CTX *mem_ctx,                            
+                                 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;
 
-       printf("Testing EnumPrivsAccount\n");
+       printf("\nTesting EnumPrivsAccount\n");
 
        r.in.handle = acct_handle;
+       r.out.privs = &privs;
 
-       status = dcerpc_lsa_EnumPrivsAccount(p, mem_ctx, &r);
+       status = dcerpc_lsa_EnumPrivsAccount(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumPrivsAccount failed - %s\n", nt_errstr(status));
                return false;
        }
 
-       if (r.out.privs && r.out.privs->count > 0) {
+       if (privs && privs->count > 0) {
                int i;
-               for (i=0;i<r.out.privs->count;i++) {
-                       test_LookupPrivName(p, mem_ctx, handle, 
-                                           &r.out.privs->set[i].luid);
+               for (i=0;i<privs->count;i++) {
+                       test_LookupPrivName(p, tctx, handle,
+                                           &privs->set[i].luid);
                }
 
-               ret &= test_RemovePrivilegesFromAccount(p, mem_ctx, acct_handle, 
-                                                       &r.out.privs->set[0].luid);
-               ret &= test_AddPrivilegesToAccount(p, mem_ctx, acct_handle, 
-                                                  &r.out.privs->set[0].luid);
+               ret &= test_RemovePrivilegesFromAccount(p, tctx, handle, acct_handle,
+                                                       &privs->set[0].luid);
+               ret &= test_AddPrivilegesToAccount(p, tctx, acct_handle,
+                                                  &privs->set[0].luid);
        }
 
        return ret;
 }
 
+static bool test_GetSystemAccessAccount(struct dcerpc_pipe *p,
+                                       struct torture_context *tctx,
+                                       struct policy_handle *handle,
+                                       struct policy_handle *acct_handle)
+{
+       NTSTATUS status;
+       uint32_t access_mask;
+       struct lsa_GetSystemAccessAccount r;
+
+       printf("\nTesting GetSystemAccessAccount\n");
+
+       r.in.handle = acct_handle;
+       r.out.access_mask = &access_mask;
+
+       status = dcerpc_lsa_GetSystemAccessAccount(p, tctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("GetSystemAccessAccount failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       if (r.out.access_mask != NULL) {
+               printf("Rights:");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_INTERACTIVE)
+                       printf(" LSA_POLICY_MODE_INTERACTIVE");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_NETWORK)
+                       printf(" LSA_POLICY_MODE_NETWORK");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_BATCH)
+                       printf(" LSA_POLICY_MODE_BATCH");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_SERVICE)
+                       printf(" LSA_POLICY_MODE_SERVICE");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_PROXY)
+                       printf(" LSA_POLICY_MODE_PROXY");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_DENY_INTERACTIVE)
+                       printf(" LSA_POLICY_MODE_DENY_INTERACTIVE");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_DENY_NETWORK)
+                       printf(" LSA_POLICY_MODE_DENY_NETWORK");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_DENY_BATCH)
+                       printf(" LSA_POLICY_MODE_DENY_BATCH");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_DENY_SERVICE)
+                       printf(" LSA_POLICY_MODE_DENY_SERVICE");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_REMOTE_INTERACTIVE)
+                       printf(" LSA_POLICY_MODE_REMOTE_INTERACTIVE");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_DENY_REMOTE_INTERACTIVE)
+                       printf(" LSA_POLICY_MODE_DENY_REMOTE_INTERACTIVE");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_ALL)
+                       printf(" LSA_POLICY_MODE_ALL");
+               if (*(r.out.access_mask) & LSA_POLICY_MODE_ALL_NT4)
+                       printf(" LSA_POLICY_MODE_ALL_NT4");
+               printf("\n");
+       }
+
+       return true;
+}
+
 static bool test_Delete(struct dcerpc_pipe *p, 
-                      TALLOC_CTX *mem_ctx, 
-                      struct policy_handle *handle)
+                       struct torture_context *tctx,
+                       struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_Delete r;
 
-       printf("testing Delete\n");
+       printf("\nTesting Delete\n");
+
+       r.in.handle = handle;
+       status = dcerpc_lsa_Delete(p, tctx, &r);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+               printf("Delete should have failed NT_STATUS_NOT_SUPPORTED - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       return true;
+}
+
+static bool test_DeleteObject(struct dcerpc_pipe *p, 
+                             struct torture_context *tctx,
+                             struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_DeleteObject r;
+
+       printf("\nTesting DeleteObject\n");
 
        r.in.handle = handle;
-       status = dcerpc_lsa_Delete(p, mem_ctx, &r);
+       r.out.handle = handle;
+       status = dcerpc_lsa_DeleteObject(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("Delete failed - %s\n", nt_errstr(status));
+               printf("DeleteObject failed - %s\n", nt_errstr(status));
                return false;
        }
 
@@ -894,7 +1020,7 @@ static bool test_Delete(struct dcerpc_pipe *p,
 
 
 static bool test_CreateAccount(struct dcerpc_pipe *p, 
-                              TALLOC_CTX *mem_ctx, 
+                              struct torture_context *tctx,
                               struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -902,22 +1028,38 @@ static bool test_CreateAccount(struct dcerpc_pipe *p,
        struct dom_sid2 *newsid;
        struct policy_handle acct_handle;
 
-       newsid = dom_sid_parse_talloc(mem_ctx, "S-1-5-12349876-4321-2854");
+       newsid = dom_sid_parse_talloc(tctx, "S-1-5-12349876-4321-2854");
 
-       printf("Testing CreateAccount\n");
+       printf("\nTesting CreateAccount\n");
 
        r.in.handle = handle;
        r.in.sid = newsid;
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
-       status = dcerpc_lsa_CreateAccount(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
+       status = dcerpc_lsa_CreateAccount(p, tctx, &r);
+       if (NT_STATUS_EQUAL(status, 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)) {
+                       printf("OpenAccount failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+       } else if (!NT_STATUS_IS_OK(status)) {
                printf("CreateAccount failed - %s\n", nt_errstr(status));
                return false;
        }
 
-       if (!test_Delete(p, mem_ctx, &acct_handle)) {
+       if (!test_Delete(p, tctx, &acct_handle)) {
+               return false;
+       }
+
+       if (!test_DeleteObject(p, tctx, &acct_handle)) {
                return false;
        }
 
@@ -925,7 +1067,7 @@ static bool test_CreateAccount(struct dcerpc_pipe *p,
 }
 
 static bool test_DeleteTrustedDomain(struct dcerpc_pipe *p, 
-                                    TALLOC_CTX *mem_ctx, 
+                                    struct torture_context *tctx,
                                     struct policy_handle *handle,
                                     struct lsa_StringLarge name)
 {
@@ -938,13 +1080,17 @@ 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, mem_ctx, &r);
+       status = dcerpc_lsa_OpenTrustedDomainByName(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("lsa_OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+               printf("OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
                return false;
        }
 
-       if (!test_Delete(p, mem_ctx, &trustdom_handle)) {
+       if (!test_Delete(p, tctx, &trustdom_handle)) {
+               return false;
+       }
+
+       if (!test_DeleteObject(p, tctx, &trustdom_handle)) {
                return false;
        }
 
@@ -952,7 +1098,7 @@ static bool test_DeleteTrustedDomain(struct dcerpc_pipe *p,
 }
 
 static bool test_DeleteTrustedDomainBySid(struct dcerpc_pipe *p, 
-                                         TALLOC_CTX *mem_ctx, 
+                                         struct torture_context *tctx,
                                          struct policy_handle *handle,
                                          struct dom_sid *sid)
 {
@@ -962,9 +1108,9 @@ static bool test_DeleteTrustedDomainBySid(struct dcerpc_pipe *p,
        r.in.handle = handle;
        r.in.dom_sid = sid;
 
-       status = dcerpc_lsa_DeleteTrustedDomain(p, mem_ctx, &r);
+       status = dcerpc_lsa_DeleteTrustedDomain(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("lsa_DeleteTrustedDomain failed - %s\n", nt_errstr(status));
+               printf("DeleteTrustedDomain failed - %s\n", nt_errstr(status));
                return false;
        }
 
@@ -973,7 +1119,7 @@ static bool test_DeleteTrustedDomainBySid(struct dcerpc_pipe *p,
 
 
 static bool test_CreateSecret(struct dcerpc_pipe *p, 
-                             TALLOC_CTX *mem_ctx, 
+                             struct torture_context *tctx,
                              struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -986,7 +1132,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
        struct lsa_SetSecret r7;
        struct lsa_QuerySecret r8;
        struct policy_handle sec_handle, sec_handle2, sec_handle3;
-       struct lsa_Delete d;
+       struct lsa_DeleteObject d_o;
        struct lsa_DATA_BUF buf1;
        struct lsa_DATA_BUF_PTR bufp1;
        struct lsa_DATA_BUF_PTR bufp2;
@@ -1006,11 +1152,11 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
        const int LOCAL = 0;
        const int GLOBAL = 1;
 
-       secname[LOCAL] = talloc_asprintf(mem_ctx, "torturesecret-%u", (uint_t)random());
-       secname[GLOBAL] = talloc_asprintf(mem_ctx, "G$torturesecret-%u", (uint_t)random());
+       secname[LOCAL] = talloc_asprintf(tctx, "torturesecret-%u", (uint_t)random());
+       secname[GLOBAL] = talloc_asprintf(tctx, "G$torturesecret-%u", (uint_t)random());
 
        for (i=0; i< 2; i++) {
-               printf("Testing CreateSecret of %s\n", secname[i]);
+               printf("\nTesting CreateSecret of %s\n", secname[i]);
                
                init_lsa_String(&r.in.name, secname[i]);
                
@@ -1018,7 +1164,7 @@ 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, mem_ctx, &r);
+               status = dcerpc_lsa_CreateSecret(p, tctx, &r);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("CreateSecret failed - %s\n", nt_errstr(status));
                        return false;
@@ -1028,7 +1174,7 @@ 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, mem_ctx, &r);
+               status = dcerpc_lsa_CreateSecret(p, tctx, &r);
                if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
                        printf("CreateSecret should have failed OBJECT_NAME_COLLISION - %s\n", nt_errstr(status));
                        return false;
@@ -1041,7 +1187,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                
                printf("Testing OpenSecret\n");
                
-               status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
+               status = dcerpc_lsa_OpenSecret(p, tctx, &r2);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("OpenSecret failed - %s\n", nt_errstr(status));
                        return false;
@@ -1064,7 +1210,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                
                printf("Testing SetSecret\n");
                
-               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
+               status = dcerpc_lsa_SetSecret(p, tctx, &r3);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("SetSecret failed - %s\n", nt_errstr(status));
                        return false;
@@ -1082,7 +1228,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
                printf("Testing SetSecret with broken key\n");
                
-               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
+               status = dcerpc_lsa_SetSecret(p, tctx, &r3);
                if (!NT_STATUS_EQUAL(status, NT_STATUS_UNKNOWN_REVISION)) {
                        printf("SetSecret should have failed UNKNOWN_REVISION - %s\n", nt_errstr(status));
                        ret = false;
@@ -1103,7 +1249,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                bufp1.buf = NULL;
                
                printf("Testing QuerySecret\n");
-               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r4);
+               status = dcerpc_lsa_QuerySecret(p, tctx, &r4);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QuerySecret failed - %s\n", nt_errstr(status));
                        ret = false;
@@ -1115,13 +1261,13 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                                blob1.data = r4.out.new_val->buf->data;
                                blob1.length = r4.out.new_val->buf->size;
                                
-                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
+                               blob2 = data_blob_talloc(tctx, NULL, blob1.length);
                                
-                               secret2 = sess_decrypt_string(mem_ctx, 
+                               secret2 = sess_decrypt_string(tctx,
                                                              &blob1, &session_key);
                                
                                if (strcmp(secret1, secret2) != 0) {
-                                       printf("Returned secret '%s' doesn't match '%s'\n", 
+                                       printf("Returned secret (r4) '%s' doesn't match '%s'\n", 
                                               secret2, secret1);
                                        ret = false;
                                }
@@ -1136,10 +1282,12 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                r5.in.new_val->data = enc_key.data;
                r5.in.new_val->length = enc_key.length;
                r5.in.new_val->size = enc_key.length;
-               
+
+
+               msleep(200);
                printf("Testing SetSecret (existing value should move to old)\n");
                
-               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r5);
+               status = dcerpc_lsa_SetSecret(p, tctx, &r5);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("SetSecret failed - %s\n", nt_errstr(status));
                        ret = false;
@@ -1160,7 +1308,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                bufp1.buf = NULL;
                bufp2.buf = NULL;
                
-               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r6);
+               status = dcerpc_lsa_QuerySecret(p, tctx, &r6);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QuerySecret failed - %s\n", nt_errstr(status));
                        ret = false;
@@ -1176,9 +1324,9 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                                blob1.data = r6.out.new_val->buf->data;
                                blob1.length = r6.out.new_val->buf->size;
                                
-                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
+                               blob2 = data_blob_talloc(tctx, NULL, blob1.length);
                                
-                               secret4 = sess_decrypt_string(mem_ctx, 
+                               secret4 = sess_decrypt_string(tctx,
                                                              &blob1, &session_key);
                                
                                if (strcmp(secret3, secret4) != 0) {
@@ -1189,9 +1337,9 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                                blob1.data = r6.out.old_val->buf->data;
                                blob1.length = r6.out.old_val->buf->length;
                                
-                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
+                               blob2 = data_blob_talloc(tctx, NULL, blob1.length);
                                
-                               secret2 = sess_decrypt_string(mem_ctx, 
+                               secret2 = sess_decrypt_string(tctx,
                                                              &blob1, &session_key);
                                
                                if (strcmp(secret1, secret2) != 0) {
@@ -1200,9 +1348,11 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                                }
                                
                                if (*r6.out.new_mtime == *r6.out.old_mtime) {
-                                       printf("Returned secret %s had same mtime for both secrets: %s\n", 
+                                       printf("Returned secret (r6-%d) %s must not have same mtime for both secrets: %s != %s\n", 
+                                              i,
                                               secname[i],
-                                              nt_time_string(mem_ctx, *r6.out.new_mtime));
+                                              nt_time_string(tctx, *r6.out.old_mtime),
+                                              nt_time_string(tctx, *r6.out.new_mtime));
                                        ret = false;
                                }
                        }
@@ -1219,7 +1369,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                
                printf("Testing SetSecret of old Secret only\n");
                
-               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r7);
+               status = dcerpc_lsa_SetSecret(p, tctx, &r7);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("SetSecret failed - %s\n", nt_errstr(status));
                        ret = false;
@@ -1237,7 +1387,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                bufp1.buf = NULL;
                bufp2.buf = NULL;
                
-               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r8);
+               status = dcerpc_lsa_QuerySecret(p, tctx, &r8);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QuerySecret failed - %s\n", nt_errstr(status));
                        ret = false;
@@ -1245,41 +1395,22 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                        if (!r8.out.new_val || !r8.out.old_val) {
                                printf("in/out pointers not returned, despite being set on in for QuerySecret\n");
                                ret = false;
-                       } else if (r8.out.new_val->buf == NULL) {
-                               if (i != LOCAL) { 
-                                       printf("NEW secret buffer not returned after GLOBAL OLD set\n");
-                                       ret = false;
-                               }
+                       } else if (r8.out.new_val->buf != NULL) {
+                               printf("NEW secret buffer must not be returned after OLD set\n");
+                               ret = false;
                        } else if (r8.out.old_val->buf == NULL) {
-                               printf("OLD secret buffer not returned after OLD set\n");
+                               printf("OLD secret buffer was not returned after OLD set\n");
                                ret = false;
                        } else if (r8.out.new_mtime == NULL || r8.out.old_mtime == NULL) {
                                printf("Both times not returned after OLD set\n");
                                ret = false;
                        } else {
-                               if (i == LOCAL) { 
-                                       printf("NEW secret buffer should not be returned after LOCAL OLD set\n");
-                                       ret = false;
-                               }
-                               blob1.data = r8.out.new_val->buf->data;
-                               blob1.length = r8.out.new_val->buf->length;
-                               
-                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
-                               
-                               secret6 = sess_decrypt_string(mem_ctx,
-                                                             &blob1, &session_key);
-                               
-                               if (strcmp(secret3, secret4) != 0) {
-                                       printf("Returned NEW secret '%s' doesn't match '%s'\n", secret4, secret3);
-                                       ret = false;
-                               }
-
                                blob1.data = r8.out.old_val->buf->data;
                                blob1.length = r8.out.old_val->buf->size;
                                
-                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
+                               blob2 = data_blob_talloc(tctx, NULL, blob1.length);
                                
-                               secret6 = sess_decrypt_string(mem_ctx,
+                               secret6 = sess_decrypt_string(tctx,
                                                              &blob1, &session_key);
                                
                                if (strcmp(secret5, secret6) != 0) {
@@ -1287,29 +1418,27 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
                                        ret = false;
                                }
                                
-                               if (*r8.out.new_mtime == *r8.out.old_mtime) {
-                                       if (i != GLOBAL) { 
-                                               printf("Returned secret %s had same mtime for both secrets: %s\n", 
-                                                      secname[i],
-                                                      nt_time_string(mem_ctx, *r8.out.new_mtime));
-                                               ret = false;
-                                       }
-                               } else {
-                                       printf("Returned secret %s should have had same mtime for both secrets: %s != %s\n", 
+                               if (*r8.out.new_mtime != *r8.out.old_mtime) {
+                                       printf("Returned secret (r8) %s did not had same mtime for both secrets: %s != %s\n", 
                                               secname[i],
-                                              nt_time_string(mem_ctx, *r8.out.old_mtime),
-                                              nt_time_string(mem_ctx, *r8.out.new_mtime));
+                                              nt_time_string(tctx, *r8.out.old_mtime),
+                                              nt_time_string(tctx, *r8.out.new_mtime));
                                        ret = false;
                                }
                        }
                }
 
-               if (!test_Delete(p, mem_ctx, &sec_handle)) {
+               if (!test_Delete(p, tctx, &sec_handle)) {
                        ret = false;
                }
                
-               d.in.handle = &sec_handle2;
-               status = dcerpc_lsa_Delete(p, mem_ctx, &d);
+               if (!test_DeleteObject(p, 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)) {
                        printf("Second delete expected INVALID_HANDLE - %s\n", nt_errstr(status));
                        ret = false;
@@ -1317,7 +1446,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
                        printf("Testing OpenSecret of just-deleted secret\n");
                        
-                       status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
+                       status = dcerpc_lsa_OpenSecret(p, tctx, &r2);
                        if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
                                printf("OpenSecret expected OBJECT_NAME_NOT_FOUND - %s\n", nt_errstr(status));
                                ret = false;
@@ -1331,7 +1460,7 @@ static bool test_CreateSecret(struct dcerpc_pipe *p,
 
 
 static bool test_EnumAccountRights(struct dcerpc_pipe *p, 
-                                  TALLOC_CTX *mem_ctx, 
+                                  struct torture_context *tctx,
                                   struct policy_handle *acct_handle,
                                   struct dom_sid *sid)
 {
@@ -1339,16 +1468,16 @@ static bool test_EnumAccountRights(struct dcerpc_pipe *p,
        struct lsa_EnumAccountRights r;
        struct lsa_RightSet rights;
 
-       printf("Testing EnumAccountRights\n");
+       printf("\nTesting EnumAccountRights\n");
 
        r.in.handle = acct_handle;
        r.in.sid = sid;
        r.out.rights = &rights;
 
-       status = dcerpc_lsa_EnumAccountRights(p, mem_ctx, &r);
+       status = dcerpc_lsa_EnumAccountRights(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumAccountRights of %s failed - %s\n", 
-                      dom_sid_string(mem_ctx, sid), nt_errstr(status));
+                      dom_sid_string(tctx, sid), nt_errstr(status));
                return false;
        }
 
@@ -1363,16 +1492,18 @@ static bool test_QuerySecurity(struct dcerpc_pipe *p,
 {
        NTSTATUS status;
        struct lsa_QuerySecurity r;
+       struct sec_desc_buf *sdbuf = NULL;
 
        if (torture_setting_bool(tctx, "samba4", false)) {
-               printf("skipping QuerySecurity test against Samba4\n");
+               printf("\nskipping QuerySecurity test against Samba4\n");
                return true;
        }
 
-       printf("Testing QuerySecurity\n");
+       printf("\nTesting QuerySecurity\n");
 
        r.in.handle = acct_handle;
        r.in.sec_info = 7;
+       r.out.sdbuf = &sdbuf;
 
        status = dcerpc_lsa_QuerySecurity(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1384,7 +1515,7 @@ static bool test_QuerySecurity(struct dcerpc_pipe *p,
 }
 
 static bool test_OpenAccount(struct dcerpc_pipe *p, 
-                            TALLOC_CTX *mem_ctx, 
+                            struct torture_context *tctx,
                             struct policy_handle *handle,
                             struct dom_sid *sid)
 {
@@ -1392,24 +1523,28 @@ static bool test_OpenAccount(struct dcerpc_pipe *p,
        struct lsa_OpenAccount r;
        struct policy_handle acct_handle;
 
-       printf("Testing OpenAccount\n");
+       printf("\nTesting OpenAccount\n");
 
        r.in.handle = handle;
        r.in.sid = sid;
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
-       status = dcerpc_lsa_OpenAccount(p, mem_ctx, &r);
+       status = dcerpc_lsa_OpenAccount(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("OpenAccount failed - %s\n", nt_errstr(status));
                return false;
        }
 
-       if (!test_EnumPrivsAccount(p, mem_ctx, handle, &acct_handle)) {
+       if (!test_EnumPrivsAccount(p, tctx, handle, &acct_handle)) {
                return false;
        }
 
-       if (!test_QuerySecurity(p, mem_ctx, handle, &acct_handle)) {
+       if (!test_GetSystemAccessAccount(p, tctx, handle, &acct_handle)) {
+               return false;
+       }
+
+       if (!test_QuerySecurity(p, tctx, handle, &acct_handle)) {
                return false;
        }
 
@@ -1417,8 +1552,8 @@ static bool test_OpenAccount(struct dcerpc_pipe *p,
 }
 
 static bool test_EnumAccounts(struct dcerpc_pipe *p, 
-                         TALLOC_CTX *mem_ctx, 
-                         struct policy_handle *handle)
+                             struct torture_context *tctx,
+                             struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_EnumAccounts r;
@@ -1427,7 +1562,7 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
        int i;
        bool ret = true;
 
-       printf("\ntesting EnumAccounts\n");
+       printf("\nTesting EnumAccounts\n");
 
        r.in.handle = handle;
        r.in.resume_handle = &resume_handle;
@@ -1437,7 +1572,7 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
 
        resume_handle = 0;
        while (true) {
-               status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
+               status = dcerpc_lsa_EnumAccounts(p, tctx, &r);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
                        break;
                }
@@ -1446,22 +1581,22 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
                        return false;
                }
 
-               if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
+               if (!test_LookupSids(p, tctx, handle, &sids1)) {
                        return false;
                }
 
-               if (!test_LookupSids2(p, mem_ctx, handle, &sids1)) {
+               if (!test_LookupSids2(p, tctx, handle, &sids1)) {
                        return false;
                }
 
-               if (!test_LookupSids3(p, mem_ctx, &sids1)) {
-                       return false;
-               }
+               /* Can't test lookupSids3 here, as clearly we must not
+                * be on schannel, or we would not be able to do the
+                * rest */
 
-               printf("testing all accounts\n");
+               printf("Testing all accounts\n");
                for (i=0;i<sids1.num_sids;i++) {
-                       ret &= test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
-                       ret &= test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
+                       ret &= test_OpenAccount(p, tctx, handle, sids1.sids[i].sid);
+                       ret &= test_EnumAccountRights(p, tctx, handle, sids1.sids[i].sid);
                }
                printf("\n");
        }
@@ -1470,12 +1605,12 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
                return ret;
        }
        
-       printf("trying EnumAccounts partial listing (asking for 1 at 2)\n");
+       printf("Trying EnumAccounts partial listing (asking for 1 at 2)\n");
        resume_handle = 2;
        r.in.num_entries = 1;
        r.out.sids = &sids2;
 
-       status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
+       status = dcerpc_lsa_EnumAccounts(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumAccounts failed - %s\n", nt_errstr(status));
                return false;
@@ -1490,40 +1625,43 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
 }
 
 static bool test_LookupPrivDisplayName(struct dcerpc_pipe *p,
-                               TALLOC_CTX *mem_ctx,
-                               struct policy_handle *handle,
-                               struct lsa_String *priv_name)
+                                      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;
+       uint16_t returned_language_id = 0;
+       struct lsa_StringLarge *disp_name = NULL;
 
-       printf("testing LookupPrivDisplayName(%s)\n", priv_name->string);
+       printf("\nTesting LookupPrivDisplayName(%s)\n", priv_name->string);
        
        r.in.handle = handle;
        r.in.name = priv_name;
-       r.in.language_id = &language_id;
-       r.out.language_id = &language_id;
-       r.in.unknown = 0;
+       r.in.language_id = language_id;
+       r.in.language_id_sys = 0;
+       r.out.returned_language_id = &returned_language_id;
+       r.out.disp_name = &disp_name;
 
-       status = dcerpc_lsa_LookupPrivDisplayName(p, mem_ctx, &r);
+       status = dcerpc_lsa_LookupPrivDisplayName(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupPrivDisplayName failed - %s\n", nt_errstr(status));
                return false;
        }
        printf("%s -> \"%s\"  (language 0x%x/0x%x)\n", 
-              priv_name->string, r.out.disp_name->string, 
-              *r.in.language_id, *r.out.language_id);
+              priv_name->string, disp_name->string,
+              r.in.language_id, *r.out.returned_language_id);
 
        return true;
 }
 
-static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p, 
-                               TALLOC_CTX *mem_ctx,
-                               struct policy_handle *handle,
-                               struct lsa_String *priv_name)
+static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
+                                          struct torture_context *tctx,
+                                          struct policy_handle *handle,
+                                          struct lsa_String *priv_name)
 {
        struct lsa_EnumAccountsWithUserRight r;
        struct lsa_SidArray sids;
@@ -1531,13 +1669,13 @@ static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
 
        ZERO_STRUCT(sids);
        
-       printf("testing EnumAccountsWithUserRight(%s)\n", priv_name->string);
+       printf("\nTesting EnumAccountsWithUserRight(%s)\n", priv_name->string);
        
        r.in.handle = handle;
        r.in.name = priv_name;
        r.out.sids = &sids;
 
-       status = dcerpc_lsa_EnumAccountsWithUserRight(p, mem_ctx, &r);
+       status = dcerpc_lsa_EnumAccountsWithUserRight(p, tctx, &r);
 
        /* NT_STATUS_NO_MORE_ENTRIES means noone has this privilege */
        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
@@ -1553,8 +1691,8 @@ static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
 }
 
 
-static bool test_EnumPrivs(struct dcerpc_pipe *p, 
-                          TALLOC_CTX *mem_ctx, 
+static bool test_EnumPrivs(struct dcerpc_pipe *p,
+                          struct torture_context *tctx,
                           struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -1564,7 +1702,7 @@ static bool test_EnumPrivs(struct dcerpc_pipe *p,
        int i;
        bool ret = true;
 
-       printf("\ntesting EnumPrivs\n");
+       printf("\nTesting EnumPrivs\n");
 
        r.in.handle = handle;
        r.in.resume_handle = &resume_handle;
@@ -1573,16 +1711,16 @@ static bool test_EnumPrivs(struct dcerpc_pipe *p,
        r.out.privs = &privs1;
 
        resume_handle = 0;
-       status = dcerpc_lsa_EnumPrivs(p, mem_ctx, &r);
+       status = dcerpc_lsa_EnumPrivs(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumPrivs failed - %s\n", nt_errstr(status));
                return false;
        }
 
        for (i = 0; i< privs1.count; i++) {
-               test_LookupPrivDisplayName(p, mem_ctx, handle, (struct lsa_String *)&privs1.privs[i].name);
-               test_LookupPrivValue(p, mem_ctx, handle, (struct lsa_String *)&privs1.privs[i].name);
-               if (!test_EnumAccountsWithUserRight(p, mem_ctx, handle, (struct lsa_String *)&privs1.privs[i].name)) {
+               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)) {
                        ret = false;
                }
        }
@@ -1624,7 +1762,7 @@ static bool test_QueryForestTrustInformation(struct dcerpc_pipe *p,
        status = dcerpc_lsa_lsaRQueryForestTrustInformation(p, tctx, &r);
 
        if (!NT_STATUS_IS_OK(status)) {
-               printf("lsaRQueryForestTrustInformation failed - %s\n", nt_errstr(status));
+               printf("lsaRQueryForestTrustInformation of %s failed - %s\n", trusted_domain_name, nt_errstr(status));
                ret = false;
        }
 
@@ -1632,7 +1770,7 @@ static bool test_QueryForestTrustInformation(struct dcerpc_pipe *p,
 }
 
 static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p, 
-                                      TALLOC_CTX *mem_ctx, 
+                                      struct torture_context *tctx,
                                       struct policy_handle *handle, 
                                       struct lsa_DomainListEx *domains) 
 {
@@ -1642,7 +1780,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, mem_ctx, handle, 
+                       ret &= test_QueryForestTrustInformation(p, tctx, handle,
                                                                domains->domains[i].domain_name.string);
                }
        }
@@ -1651,7 +1789,7 @@ static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p,
 }
 
 static bool test_query_each_TrustDom(struct dcerpc_pipe *p, 
-                                    TALLOC_CTX *mem_ctx, 
+                                    struct torture_context *tctx,
                                     struct policy_handle *handle, 
                                     struct lsa_DomainList *domains) 
 {
@@ -1667,8 +1805,8 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                struct policy_handle handle2;
                struct lsa_Close c;
                struct lsa_CloseTrustedDomainEx c_trust;
-               int levels [] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-               int ok[]      = {1, 0, 1, 0, 0, 1, 0, 1, 0,  0,  0,  1};
+               int levels [] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13};
+               int ok[]      = {1, 0, 1, 0, 0, 1, 0, 1, 0,  0,  0,  1, 1};
 
                if (domains->domains[i].sid) {
                        trust.in.handle = handle;
@@ -1676,7 +1814,7 @@ 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, mem_ctx, &trust);
+                       status = dcerpc_lsa_OpenTrustedDomain(p, tctx, &trust);
                        
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("OpenTrustedDomain failed - %s\n", nt_errstr(status));
@@ -1691,11 +1829,11 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                        
                        for (j=0; j < ARRAY_SIZE(levels); j++) {
                                struct lsa_QueryTrustedDomainInfo q;
-                               union lsa_TrustedDomainInfo info;
+                               union lsa_TrustedDomainInfo *info = NULL;
                                q.in.trustdom_handle = &trustdom_handle;
                                q.in.level = levels[j];
                                q.out.info = &info;
-                               status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                               status = dcerpc_lsa_QueryTrustedDomainInfo(p, tctx, &q);
                                if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                        printf("QueryTrustedDomainInfo level %d failed - %s\n", 
                                               levels[j], nt_errstr(status));
@@ -1707,7 +1845,7 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                                }
                        }
                        
-                       status = dcerpc_lsa_CloseTrustedDomainEx(p, mem_ctx, &c_trust);
+                       status = dcerpc_lsa_CloseTrustedDomainEx(p, tctx, &c_trust);
                        if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
                                printf("Expected CloseTrustedDomainEx to return NT_STATUS_NOT_IMPLEMENTED, instead - %s\n", nt_errstr(status));
                                return false;
@@ -1716,7 +1854,7 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                        c.in.handle = &trustdom_handle;
                        c.out.handle = &handle2;
                        
-                       status = dcerpc_lsa_Close(p, mem_ctx, &c);
+                       status = dcerpc_lsa_Close(p, tctx, &c);
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("Close of trusted domain failed - %s\n", nt_errstr(status));
                                return false;
@@ -1724,7 +1862,7 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
 
                        for (j=0; j < ARRAY_SIZE(levels); j++) {
                                struct lsa_QueryTrustedDomainInfoBySid q;
-                               union lsa_TrustedDomainInfo info;
+                               union lsa_TrustedDomainInfo *info = NULL;
                                
                                if (!domains->domains[i].sid) {
                                        continue;
@@ -1734,7 +1872,8 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                                q.in.dom_sid = domains->domains[i].sid;
                                q.in.level   = levels[j];
                                q.out.info   = &info;
-                               status = dcerpc_lsa_QueryTrustedDomainInfoBySid(p, mem_ctx, &q);
+
+                               status = dcerpc_lsa_QueryTrustedDomainInfoBySid(p, tctx, &q);
                                if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                        printf("QueryTrustedDomainInfoBySid level %d failed - %s\n", 
                                               levels[j], nt_errstr(status));
@@ -1752,7 +1891,7 @@ 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, mem_ctx, &trust_by_name);
+               status = dcerpc_lsa_OpenTrustedDomainByName(p, tctx, &trust_by_name);
                        
                if (!NT_STATUS_IS_OK(status)) {
                        printf("OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
@@ -1761,11 +1900,11 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
 
                for (j=0; j < ARRAY_SIZE(levels); j++) {
                        struct lsa_QueryTrustedDomainInfo q;
-                       union lsa_TrustedDomainInfo info;
+                       union lsa_TrustedDomainInfo *info = NULL;
                        q.in.trustdom_handle = &trustdom_handle;
                        q.in.level = levels[j];
                        q.out.info = &info;
-                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, tctx, &q);
                        if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                printf("QueryTrustedDomainInfo level %d failed - %s\n", 
                                       levels[j], nt_errstr(status));
@@ -1780,7 +1919,7 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
                c.in.handle = &trustdom_handle;
                c.out.handle = &handle2;
 
-               status = dcerpc_lsa_Close(p, mem_ctx, &c);
+               status = dcerpc_lsa_Close(p, tctx, &c);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("Close of trusted domain failed - %s\n", nt_errstr(status));
                        return false;
@@ -1788,12 +1927,16 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
 
                for (j=0; j < ARRAY_SIZE(levels); j++) {
                        struct lsa_QueryTrustedDomainInfoByName q;
-                       union lsa_TrustedDomainInfo info;
+                       union lsa_TrustedDomainInfo *info = NULL;
+                       struct lsa_String name;
+
+                       name.string = domains->domains[i].name.string;
+
                        q.in.handle         = handle;
-                       q.in.trusted_domain.string = domains->domains[i].name.string;
+                       q.in.trusted_domain = &name;
                        q.in.level          = levels[j];
                        q.out.info          = &info;
-                       status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, mem_ctx, &q);
+                       status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, tctx, &q);
                        if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                printf("QueryTrustedDomainInfoByName level %d failed - %s\n", 
                                       levels[j], nt_errstr(status));
@@ -1809,7 +1952,7 @@ static bool test_query_each_TrustDom(struct dcerpc_pipe *p,
 }
 
 static bool test_EnumTrustDom(struct dcerpc_pipe *p, 
-                             TALLOC_CTX *mem_ctx, 
+                             struct torture_context *tctx,
                              struct policy_handle *handle)
 {
        struct lsa_EnumTrustDom r;
@@ -1822,6 +1965,27 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
 
        printf("\nTesting EnumTrustDom\n");
 
+       r.in.handle = handle;
+       r.in.resume_handle = &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);
+       
+       if (NT_STATUS_IS_OK(enum_status)) {
+               if (domains.count == 0) {
+                       printf("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))) {
+               printf("EnumTrustDom of zero size failed - %s\n", nt_errstr(enum_status));
+               return false;
+       }
+               
+       /* Start from the bottom again */
+       resume_handle = 0;
+
        do {
                r.in.handle = handle;
                r.in.resume_handle = &resume_handle;
@@ -1829,11 +1993,15 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
                r.out.domains = &domains;
                r.out.resume_handle = &resume_handle;
                
-               enum_status = dcerpc_lsa_EnumTrustDom(p, mem_ctx, &r);
+               enum_status = dcerpc_lsa_EnumTrustDom(p, tctx, &r);
                
                /* NO_MORE_ENTRIES is allowed */
                if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
-                       return true;
+                       if (domains.count == 0) {
+                               return true;
+                       }
+                       printf("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)) {
                        /* Windows 2003 gets this off by one on the first run */
                        if (r.out.domains->count < 3 || r.out.domains->count > 4) {
@@ -1848,12 +2016,30 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
                        return false;
                }
                
-               ret &= test_query_each_TrustDom(p, mem_ctx, handle, &domains);
+               if (domains.count == 0) {
+                       printf("EnumTrustDom failed - should have returned 'NT_STATUS_NO_MORE_ENTRIES' for 0 trusted domains\n");
+                       return false;
+               }
+
+               ret &= test_query_each_TrustDom(p, tctx, handle, &domains);
                
        } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
 
        printf("\nTesting EnumTrustedDomainsEx\n");
 
+       r_ex.in.handle = handle;
+       r_ex.in.resume_handle = &resume_handle;
+       r_ex.in.max_size = LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER * 3;
+       r_ex.out.domains = &domains_ex;
+       r_ex.out.resume_handle = &resume_handle;
+       
+       enum_status = dcerpc_lsa_EnumTrustedDomainsEx(p, tctx, &r_ex);
+       
+       if (!(NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES))) {
+               printf("EnumTrustedDomainEx of zero size failed - %s\n", nt_errstr(enum_status));
+               return false;
+       }
+               
        resume_handle = 0;
        do {
                r_ex.in.handle = handle;
@@ -1862,11 +2048,15 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
                r_ex.out.domains = &domains_ex;
                r_ex.out.resume_handle = &resume_handle;
                
-               enum_status = dcerpc_lsa_EnumTrustedDomainsEx(p, mem_ctx, &r_ex);
+               enum_status = dcerpc_lsa_EnumTrustedDomainsEx(p, tctx, &r_ex);
                
                /* NO_MORE_ENTRIES is allowed */
                if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
-                       return true;
+                       if (domains_ex.count == 0) {
+                               return true;
+                       }
+                       printf("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)) {
                        /* Windows 2003 gets this off by one on the first run */
                        if (r_ex.out.domains->count < 3 || r_ex.out.domains->count > 4) {
@@ -1876,15 +2066,18 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
                                       r_ex.in.max_size,
                                       LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER, 
                                       r_ex.in.max_size / LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER);
-                               ret = false;
-                               exit(1);
                        }
                } else if (!NT_STATUS_IS_OK(enum_status)) {
                        printf("EnumTrustedDomainEx failed - %s\n", nt_errstr(enum_status));
                        return false;
                }
 
-               ret &= test_query_each_TrustDomEx(p, mem_ctx, handle, &domains_ex);
+               if (domains_ex.count == 0) {
+                       printf("EnumTrustDomainEx failed - should have returned 'NT_STATUS_NO_MORE_ENTRIES' for 0 trusted domains\n");
+                       return false;
+               }
+
+               ret &= test_query_each_TrustDomEx(p, tctx, handle, &domains_ex);
                
        } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
 
@@ -1892,7 +2085,7 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
 }
 
 static bool test_CreateTrustedDomain(struct dcerpc_pipe *p, 
-                                    TALLOC_CTX *mem_ctx, 
+                                    struct torture_context *tctx,
                                     struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -1902,28 +2095,33 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p,
        struct dom_sid *domsid[12];
        struct policy_handle trustdom_handle[12];
        struct lsa_QueryTrustedDomainInfo q;
+       union lsa_TrustedDomainInfo *info = NULL;
        int i;
 
-       printf("Testing CreateTrustedDomain for 12 domains\n");
+       printf("\nTesting CreateTrustedDomain for 12 domains\n");
 
+       if (!test_EnumTrustDom(p, tctx, handle)) {
+               ret = false;
+       }
+       
        for (i=0; i< 12; i++) {
-               char *trust_name = talloc_asprintf(mem_ctx, "torturedom%02d", i);
-               char *trust_sid = talloc_asprintf(mem_ctx, "S-1-5-21-97398-379795-100%02d", 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);
                
-               domsid[i] = dom_sid_parse_talloc(mem_ctx, trust_sid);
+               domsid[i] = dom_sid_parse_talloc(tctx, trust_sid);
 
                trustinfo.sid = domsid[i];
                init_lsa_String((struct lsa_String *)&trustinfo.name, trust_name);
 
-               r.in.handle = handle;
+               r.in.policy_handle = handle;
                r.in.info = &trustinfo;
                r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                r.out.trustdom_handle = &trustdom_handle[i];
                
-               status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
+               status = dcerpc_lsa_CreateTrustedDomain(p, tctx, &r);
                if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-                       test_DeleteTrustedDomain(p, mem_ctx, handle, trustinfo.name);
-                       status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
+                       test_DeleteTrustedDomain(p, tctx, handle, trustinfo.name);
+                       status = dcerpc_lsa_CreateTrustedDomain(p, tctx, &r);
                }
                if (!NT_STATUS_IS_OK(status)) {
                        printf("CreateTrustedDomain failed - %s\n", nt_errstr(status));
@@ -1931,17 +2129,167 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p,
                } else {
                
                        q.in.trustdom_handle = &trustdom_handle[i];
-                       q.in.level = LSA_TRUSTED_DOMAIN_INFO_NAME;
-                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                       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)) {
+                               printf("QueryTrustedDomainInfo level 1 failed - %s\n", nt_errstr(status));
+                               ret = false;
+                       } else if (!q.out.info) {
+                               ret = false;
+                       } else {
+                               if (strcmp(info->info_ex.netbios_name.string, trustinfo.name.string) != 0) {
+                                       printf("QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n",
+                                              info->info_ex.netbios_name.string, trustinfo.name.string);
+                                       ret = false;
+                               }
+                               if (info->info_ex.trust_type != LSA_TRUST_TYPE_DOWNLEVEL) {
+                                       printf("QueryTrustedDomainInfo of %s returned incorrect trust type %d != %d\n", 
+                                              trust_name, info->info_ex.trust_type, LSA_TRUST_TYPE_DOWNLEVEL);
+                                       ret = false;
+                               }
+                               if (info->info_ex.trust_attributes != 0) {
+                                       printf("QueryTrustedDomainInfo of %s returned incorrect trust attributes %d != %d\n", 
+                                              trust_name, info->info_ex.trust_attributes, 0);
+                                       ret = false;
+                               }
+                               if (info->info_ex.trust_direction != LSA_TRUST_DIRECTION_OUTBOUND) {
+                                       printf("QueryTrustedDomainInfo of %s returned incorrect trust direction %d != %d\n", 
+                                              trust_name, info->info_ex.trust_direction, LSA_TRUST_DIRECTION_OUTBOUND);
+                                       ret = false;
+                               }
+                       }
+               }
+       }
+
+       /* now that we have some domains to look over, we can test the enum calls */
+       if (!test_EnumTrustDom(p, tctx, handle)) {
+               ret = false;
+       }
+       
+       for (i=0; i<12; i++) {
+               if (!test_DeleteTrustedDomainBySid(p, tctx, handle, domsid[i])) {
+                       ret = false;
+               }
+       }
+
+       return ret;
+}
+
+static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p, 
+                                       struct torture_context *tctx, 
+                                       struct policy_handle *handle)
+{
+       NTSTATUS status;
+       bool ret = true;
+       struct lsa_CreateTrustedDomainEx2 r;
+       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_QueryTrustedDomainInfo q;
+       union lsa_TrustedDomainInfo *info = NULL;
+       DATA_BLOB session_key;
+       enum ndr_err_code ndr_err;
+       int i;
+
+       printf("\nTesting CreateTrustedDomainEx2 for 12 domains\n");
+
+       status = dcerpc_fetch_session_key(p, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("dcerpc_fetch_session_key failed - %s\n", nt_errstr(status));
+               return false;
+       }
+               
+       for (i=0; i< 12; 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);
+
+               domsid[i] = dom_sid_parse_talloc(tctx, trust_sid);
+
+               trustinfo.sid = domsid[i];
+               trustinfo.netbios_name.string = trust_name;
+               trustinfo.domain_name.string = trust_name_dns;
+
+               /* Create inbound, some outbound, and some
+                * bi-directional trusts in a repeating pattern based
+                * on i */
+
+               /* 1 == inbound, 2 == outbound, 3 == both */
+               trustinfo.trust_direction = (i % 3) + 1;
+
+               /* Try different trust types too */
+
+               /* 1 == downlevel (NT4), 2 == uplevel (ADS), 3 == MIT (kerberos but not AD) */
+               trustinfo.trust_type = (((i / 3) + 1) % 3) + 1;
+
+               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;
+
+               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)) {
+                       printf("ndr_push_struct_blob of trustDomainPasswords structure failed");
+                       ret = false;
+               }
+
+               arcfour_crypt_blob(auth_blob.data, auth_blob.length, &session_key);
+
+               authinfo.auth_blob.size = auth_blob.length;
+               authinfo.auth_blob.data = auth_blob.data;
+
+               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];
+
+               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);
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("CreateTrustedDomainEx failed2 - %s\n", nt_errstr(status));
+                       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)) {
                                printf("QueryTrustedDomainInfo level 1 failed - %s\n", nt_errstr(status));
                                ret = false;
                        } else if (!q.out.info) {
+                               printf("QueryTrustedDomainInfo level 1 failed to return an info pointer\n");
                                ret = false;
                        } else {
-                               if (strcmp(q.out.info->name.netbios_name.string, trustinfo.name.string) != 0) {
+                               if (strcmp(info->info_ex.netbios_name.string, trustinfo.netbios_name.string) != 0) {
                                        printf("QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n",
-                                              q.out.info->name.netbios_name.string, trustinfo.name.string);
+                                              info->info_ex.netbios_name.string, trustinfo.netbios_name.string);
+                                       ret = false;
+                               }
+                               if (info->info_ex.trust_type != trustinfo.trust_type) {
+                                       printf("QueryTrustedDomainInfo of %s returned incorrect trust type %d != %d\n", 
+                                              trust_name, info->info_ex.trust_type, trustinfo.trust_type);
+                                       ret = false;
+                               }
+                               if (info->info_ex.trust_attributes != LSA_TRUST_ATTRIBUTE_USES_RC4_ENCRYPTION) {
+                                       printf("QueryTrustedDomainInfo of %s returned incorrect trust attributes %d != %d\n", 
+                                              trust_name, info->info_ex.trust_attributes, LSA_TRUST_ATTRIBUTE_USES_RC4_ENCRYPTION);
+                                       ret = false;
+                               }
+                               if (info->info_ex.trust_direction != trustinfo.trust_direction) {
+                                       printf("QueryTrustedDomainInfo of %s returned incorrect trust direction %d != %d\n", 
+                                              trust_name, info->info_ex.trust_direction, trustinfo.trust_direction);
                                        ret = false;
                                }
                        }
@@ -1949,12 +2297,14 @@ 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, mem_ctx, handle)) {
+       if (!test_EnumTrustDom(p, tctx, handle)) {
+               printf("test_EnumTrustDom failed\n");
                ret = false;
        }
        
        for (i=0; i<12; i++) {
-               if (!test_DeleteTrustedDomainBySid(p, mem_ctx, handle, domsid[i])) {
+               if (!test_DeleteTrustedDomainBySid(p, tctx, handle, domsid[i])) {
+                       printf("test_DeleteTrustedDomainBySid failed\n");
                        ret = false;
                }
        }
@@ -1967,25 +2317,26 @@ static bool test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
                                 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, "samba4", false)) {
-               printf("skipping QueryDomainInformationPolicy test against Samba4\n");
-               return true;
-       }
 
        printf("\nTesting QueryDomainInformationPolicy\n");
 
        for (i=2;i<4;i++) {
                r.in.handle = handle;
                r.in.level = i;
+               r.out.info = &info;
 
-               printf("\ntrying QueryDomainInformationPolicy level %d\n", i);
+               printf("\nTrying QueryDomainInformationPolicy level %d\n", i);
 
                status = dcerpc_lsa_QueryDomainInformationPolicy(p, tctx, &r);
 
-               if (!NT_STATUS_IS_OK(status)) {
+               /* 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)) {
+                       continue;
+               } else if (!NT_STATUS_IS_OK(status)) {
                        printf("QueryDomainInformationPolicy failed - %s\n", nt_errstr(status));
                        ret = false;
                        continue;
@@ -1996,38 +2347,65 @@ static bool test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
 }
 
 
-static bool test_QueryInfoPolicy(struct dcerpc_pipe *p, 
-                                struct torture_context *tctx, 
-                                struct policy_handle *handle)
+static bool test_QueryInfoPolicyCalls( bool version2,
+                                       struct dcerpc_pipe *p,
+                                       struct torture_context *tctx,
+                                       struct policy_handle *handle)
 {
        struct lsa_QueryInfoPolicy r;
+       union lsa_PolicyInformation *info = NULL;
        NTSTATUS status;
        int i;
        bool ret = true;
-       printf("\nTesting QueryInfoPolicy\n");
 
-       for (i=1;i<13;i++) {
+       if (version2)
+               printf("\nTesting QueryInfoPolicy2\n");
+       else
+               printf("\nTesting QueryInfoPolicy\n");
+
+       for (i=1;i<=14;i++) {
                r.in.handle = handle;
                r.in.level = i;
+               r.out.info = &info;
 
-               printf("\ntrying QueryInfoPolicy level %d\n", i);
+               if (version2)
+                       printf("\nTrying QueryInfoPolicy2 level %d\n", i);
+               else
+                       printf("\nTrying QueryInfoPolicy level %d\n", i);
 
-               status = dcerpc_lsa_QueryInfoPolicy(p, tctx, &r);
+               if (version2)
+                       /* We can perform the cast, because both types are
+                          structurally equal */
+                       status = dcerpc_lsa_QueryInfoPolicy2(p, tctx,
+                                (struct lsa_QueryInfoPolicy2*) &r);
+               else
+                       status = dcerpc_lsa_QueryInfoPolicy(p, tctx, &r);
 
                switch (i) {
-               case LSA_POLICY_INFO_DB:
+               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)) {
-                               printf("server should have failed level %u: %s\n", i, nt_errstr(status));
+                               printf("Server should have failed level %u: %s\n", i, nt_errstr(status));
                                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)) {
-                               printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                               if (version2)
+                                       printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
+                               else
+                                       printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
                                ret = false;
                        }
                        break;
@@ -2035,49 +2413,56 @@ static bool test_QueryInfoPolicy(struct dcerpc_pipe *p,
                        if (torture_setting_bool(tctx, "samba4", false)) {
                                /* Other levels not implemented yet */
                                if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)) {
-                                       printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                                       if (version2)
+                                               printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
+                                       else
+                                               printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
                                        ret = false;
                                }
                        } else if (!NT_STATUS_IS_OK(status)) {
-                               printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                               if (version2)
+                                       printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
+                               else
+                                       printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
                                ret = false;
                        }
                        break;
                }
 
-               if (NT_STATUS_IS_OK(status) && i == LSA_POLICY_INFO_DNS) {
+               if (NT_STATUS_IS_OK(status) && (i == LSA_POLICY_INFO_DNS
+                       || i == LSA_POLICY_INFO_DNS_INT)) {
                        /* Let's look up some of these names */
 
                        struct lsa_TransNameArray tnames;
                        tnames.count = 14;
                        tnames.names = talloc_zero_array(tctx, struct lsa_TranslatedName, tnames.count);
-                       tnames.names[0].name.string = r.out.info->dns.name.string;
+                       tnames.names[0].name.string = info->dns.name.string;
                        tnames.names[0].sid_type = SID_NAME_DOMAIN;
-                       tnames.names[1].name.string = r.out.info->dns.dns_domain.string;
+                       tnames.names[1].name.string = info->dns.dns_domain.string;
                        tnames.names[1].sid_type = SID_NAME_DOMAIN;
-                       tnames.names[2].name.string = talloc_asprintf(tctx, "%s\\", r.out.info->dns.name.string);
+                       tnames.names[2].name.string = talloc_asprintf(tctx, "%s\\", info->dns.name.string);
                        tnames.names[2].sid_type = SID_NAME_DOMAIN;
-                       tnames.names[3].name.string = talloc_asprintf(tctx, "%s\\", r.out.info->dns.dns_domain.string);
+                       tnames.names[3].name.string = talloc_asprintf(tctx, "%s\\", info->dns.dns_domain.string);
                        tnames.names[3].sid_type = SID_NAME_DOMAIN;
-                       tnames.names[4].name.string = talloc_asprintf(tctx, "%s\\guest", r.out.info->dns.name.string);
+                       tnames.names[4].name.string = talloc_asprintf(tctx, "%s\\guest", info->dns.name.string);
                        tnames.names[4].sid_type = SID_NAME_USER;
-                       tnames.names[5].name.string = talloc_asprintf(tctx, "%s\\krbtgt", r.out.info->dns.name.string);
+                       tnames.names[5].name.string = talloc_asprintf(tctx, "%s\\krbtgt", info->dns.name.string);
                        tnames.names[5].sid_type = SID_NAME_USER;
-                       tnames.names[6].name.string = talloc_asprintf(tctx, "%s\\guest", r.out.info->dns.dns_domain.string);
+                       tnames.names[6].name.string = talloc_asprintf(tctx, "%s\\guest", info->dns.dns_domain.string);
                        tnames.names[6].sid_type = SID_NAME_USER;
-                       tnames.names[7].name.string = talloc_asprintf(tctx, "%s\\krbtgt", r.out.info->dns.dns_domain.string);
+                       tnames.names[7].name.string = talloc_asprintf(tctx, "%s\\krbtgt", info->dns.dns_domain.string);
                        tnames.names[7].sid_type = SID_NAME_USER;
-                       tnames.names[8].name.string = talloc_asprintf(tctx, "krbtgt@%s", r.out.info->dns.name.string);
+                       tnames.names[8].name.string = talloc_asprintf(tctx, "krbtgt@%s", info->dns.name.string);
                        tnames.names[8].sid_type = SID_NAME_USER;
-                       tnames.names[9].name.string = talloc_asprintf(tctx, "krbtgt@%s", r.out.info->dns.dns_domain.string);
+                       tnames.names[9].name.string = talloc_asprintf(tctx, "krbtgt@%s", info->dns.dns_domain.string);
                        tnames.names[9].sid_type = SID_NAME_USER;
-                       tnames.names[10].name.string = talloc_asprintf(tctx, "%s\\"TEST_MACHINENAME "$", r.out.info->dns.name.string);
+                       tnames.names[10].name.string = talloc_asprintf(tctx, "%s\\"TEST_MACHINENAME "$", info->dns.name.string);
                        tnames.names[10].sid_type = SID_NAME_USER;
-                       tnames.names[11].name.string = talloc_asprintf(tctx, "%s\\"TEST_MACHINENAME "$", r.out.info->dns.dns_domain.string);
+                       tnames.names[11].name.string = talloc_asprintf(tctx, "%s\\"TEST_MACHINENAME "$", info->dns.dns_domain.string);
                        tnames.names[11].sid_type = SID_NAME_USER;
-                       tnames.names[12].name.string = talloc_asprintf(tctx, TEST_MACHINENAME "$@%s", r.out.info->dns.name.string);
+                       tnames.names[12].name.string = talloc_asprintf(tctx, TEST_MACHINENAME "$@%s", info->dns.name.string);
                        tnames.names[12].sid_type = SID_NAME_USER;
-                       tnames.names[13].name.string = talloc_asprintf(tctx, TEST_MACHINENAME "$@%s", r.out.info->dns.dns_domain.string);
+                       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);
 
@@ -2087,73 +2472,49 @@ static bool test_QueryInfoPolicy(struct dcerpc_pipe *p,
        return ret;
 }
 
+static bool test_QueryInfoPolicy(struct dcerpc_pipe *p, 
+                                struct torture_context *tctx, 
+                                struct policy_handle *handle)
+{
+       return test_QueryInfoPolicyCalls(false, p, tctx, handle);
+}
+
 static bool test_QueryInfoPolicy2(struct dcerpc_pipe *p, 
                                  struct torture_context *tctx, 
                                  struct policy_handle *handle)
 {
-       struct lsa_QueryInfoPolicy2 r;
-       NTSTATUS status;
-       int i;
-       bool ret = true;
-       printf("\nTesting QueryInfoPolicy2\n");
-       for (i=1;i<13;i++) {
-               r.in.handle = handle;
-               r.in.level = i;
-
-               printf("\ntrying QueryInfoPolicy2 level %d\n", i);
-
-               status = dcerpc_lsa_QueryInfoPolicy2(p, tctx, &r);
-               
-               switch (i) {
-               case LSA_POLICY_INFO_DB:
-               case LSA_POLICY_INFO_AUDIT_FULL_SET:
-               case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
-                       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
-                               printf("server should have failed level %u: %s\n", i, nt_errstr(status));
-                               ret = false;
-                       }
-                       break;
-               case LSA_POLICY_INFO_DOMAIN:
-               case LSA_POLICY_INFO_ACCOUNT_DOMAIN:
-               case LSA_POLICY_INFO_DNS:
-                       if (!NT_STATUS_IS_OK(status)) {
-                               printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                               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)) {
-                                       printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                                       ret = false;
-                               }
-                       } else if (!NT_STATUS_IS_OK(status)) {
-                               printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                               ret = false;
-                       }
-                       break;
-               }
-       }
-
-       return ret;
+       return test_QueryInfoPolicyCalls(true, p, tctx, handle);
 }
 
-static bool test_GetUserName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool test_GetUserName(struct dcerpc_pipe *p,
+                            struct torture_context *tctx)
 {
        struct lsa_GetUserName r;
        NTSTATUS status;
        bool ret = true;
-       struct lsa_StringPointer authority_name_p;
+       struct lsa_String *authority_name_p = NULL;
+       struct lsa_String *account_name_p = NULL;
 
        printf("\nTesting GetUserName\n");
 
-       r.in.system_name = "\\";
-       r.in.account_name = NULL;
-       r.in.authority_name = &authority_name_p;
-       authority_name_p.string = NULL;
+       r.in.system_name        = "\\";
+       r.in.account_name       = &account_name_p;
+       r.in.authority_name     = NULL;
+       r.out.account_name      = &account_name_p;
+
+       status = dcerpc_lsa_GetUserName(p, tctx, &r);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("GetUserName failed - %s\n", nt_errstr(status));
+               ret = false;
+       }
+
+       account_name_p = NULL;
+       r.in.account_name       = &account_name_p;
+       r.in.authority_name     = &authority_name_p;
+       r.out.account_name      = &account_name_p;
 
-       status = dcerpc_lsa_GetUserName(p, mem_ctx, &r);
+       status = dcerpc_lsa_GetUserName(p, tctx, &r);
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("GetUserName failed - %s\n", nt_errstr(status));
@@ -2164,25 +2525,25 @@ static bool test_GetUserName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 bool test_lsa_Close(struct dcerpc_pipe *p, 
-                   TALLOC_CTX *mem_ctx, 
+                   struct torture_context *tctx,
                    struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_Close r;
        struct policy_handle handle2;
 
-       printf("\ntesting Close\n");
+       printf("\nTesting Close\n");
 
        r.in.handle = handle;
        r.out.handle = &handle2;
 
-       status = dcerpc_lsa_Close(p, mem_ctx, &r);
+       status = dcerpc_lsa_Close(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Close failed - %s\n", nt_errstr(status));
                return false;
        }
 
-       status = dcerpc_lsa_Close(p, mem_ctx, &r);
+       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)) {
                printf("Close failed - %s\n", nt_errstr(status));
@@ -2221,7 +2582,6 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                if (!join) {
                        ret = false;
                }
-
                if (!test_LookupNames_wellknown(p, tctx, handle)) {
                        ret = false;
                }               
@@ -2245,11 +2605,14 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                if (!test_CreateSecret(p, tctx, handle)) {
                        ret = false;
                }
-               
                if (!test_CreateTrustedDomain(p, tctx, handle)) {
                        ret = false;
                }
-               
+
+               if (!test_CreateTrustedDomainEx2(p, tctx, handle)) {
+                       ret = false;
+               }
+
                if (!test_EnumAccounts(p, tctx, handle)) {
                        ret = false;
                }
@@ -2266,11 +2629,9 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                        ret = false;
                }
                
-#if 0
                if (!test_Delete(p, tctx, handle)) {
                        ret = false;
                }
-#endif
                
                if (!test_many_LookupSids(p, tctx, handle)) {
                        ret = false;
@@ -2280,7 +2641,7 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                        ret = false;
                }
                
-               torture_leave_domain(join);
+               torture_leave_domain(tctx, join);
 
        } else {
                if (!test_many_LookupSids(p, tctx, handle)) {
@@ -2295,26 +2656,20 @@ bool torture_rpc_lsa(struct torture_context *tctx)
        return ret;
 }
 
-bool torture_rpc_lsa_get_user(struct torture_context *torture)
+bool torture_rpc_lsa_get_user(struct torture_context *tctx)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
-       TALLOC_CTX *mem_ctx;
        bool ret = true;
 
-       mem_ctx = talloc_init("torture_rpc_lsa_get_user");
-
-       status = torture_rpc_connection(torture, &p, &ndr_table_lsarpc);
+       status = torture_rpc_connection(tctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(mem_ctx);
                return false;
        }
 
-       if (!test_GetUserName(p, mem_ctx)) {
+       if (!test_GetUserName(p, tctx)) {
                ret = false;
        }
-               
-       talloc_free(mem_ctx);
 
        return ret;
 }