Make RPC-LSA test deterministic with an msleep(200).
[kai/samba.git] / source4 / torture / rpc / lsa.c
index bf18f48e584ee910d2cbc33bd35985ac6128b8e9..31dc38500db599b3c5c19149b2f57dab91b4d52c 100644 (file)
@@ -3,10 +3,11 @@
    test suite for lsa rpc operations
 
    Copyright (C) Andrew Tridgell 2003
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-
-static void init_lsa_Name(struct lsa_Name *name, const char *s)
+#include "torture/torture.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/netlogon.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"
+#define TEST_MACHINENAME "lsatestmach"
+
+static void init_lsa_String(struct lsa_String *name, const char *s)
 {
-       name->name = s;
+       name->string = s;
 }
 
-static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        struct lsa_ObjectAttribute attr;
        struct policy_handle handle;
@@ -51,21 +60,26 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        r.in.system_name = &system_name;
        r.in.attr = &attr;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = &handle;
 
        status = dcerpc_lsa_OpenPolicy(p, mem_ctx, &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)) {
+                       printf("not considering %s to be an error\n", nt_errstr(status));
+                       return true;
+               }
                printf("OpenPolicy failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
 
-static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                            struct policy_handle *handle)
+bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                         struct policy_handle **handle)
 {
        struct lsa_ObjectAttribute attr;
        struct lsa_QosInfo qos;
@@ -74,6 +88,11 @@ static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        printf("\ntesting OpenPolicy2\n");
 
+       *handle = talloc(mem_ctx, struct policy_handle);
+       if (!*handle) {
+               return false;
+       }
+
        qos.len = 0;
        qos.impersonation_level = 2;
        qos.context_mode = 1;
@@ -88,26 +107,51 @@ static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r.in.system_name = "\\";
        r.in.attr = &attr;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r.out.handle = handle;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.out.handle = *handle;
 
        status = dcerpc_lsa_OpenPolicy2(p, mem_ctx, &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)) {
+                       printf("not considering %s to be an error\n", nt_errstr(status));
+                       talloc_free(*handle);
+                       *handle = NULL;
+                       return true;
+               }
                printf("OpenPolicy2 failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
-static BOOL test_LookupNames(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *handle,
-                           struct lsa_TransNameArray *tnames)
+
+static const char *sid_type_lookup(enum lsa_SidType r)
+{
+       switch (r) {
+               case SID_NAME_USE_NONE: return "SID_NAME_USE_NONE"; break;
+               case SID_NAME_USER: return "SID_NAME_USER"; break;
+               case SID_NAME_DOM_GRP: return "SID_NAME_DOM_GRP"; break;
+               case SID_NAME_DOMAIN: return "SID_NAME_DOMAIN"; break;
+               case SID_NAME_ALIAS: return "SID_NAME_ALIAS"; break;
+               case SID_NAME_WKN_GRP: return "SID_NAME_WKN_GRP"; break;
+               case SID_NAME_DELETED: return "SID_NAME_DELETED"; break;
+               case SID_NAME_INVALID: return "SID_NAME_INVALID"; break;
+               case SID_NAME_UNKNOWN: return "SID_NAME_UNKNOWN"; break;
+               case SID_NAME_COMPUTER: return "SID_NAME_COMPUTER"; break;
+       }
+       return "Invalid sid type\n";
+}
+
+static bool test_LookupNames(struct dcerpc_pipe *p, 
+                            TALLOC_CTX *mem_ctx, 
+                            struct policy_handle *handle,
+                            struct lsa_TransNameArray *tnames)
 {
        struct lsa_LookupNames r;
        struct lsa_TransSidArray sids;
-       struct lsa_Name *names;
+       struct lsa_String *names;
        uint32_t count = 0;
        NTSTATUS status;
        int i;
@@ -117,9 +161,9 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc(mem_ctx, tnames->count * sizeof(names[0]));
+       names = talloc_array(mem_ctx, struct lsa_String, tnames->count);
        for (i=0;i<tnames->count;i++) {
-               init_lsa_Name(&names[i], tnames->names[i].name.name);
+               init_lsa_String(&names[i], tnames->names[i].name.string);
        }
 
        r.in.handle = handle;
@@ -132,18 +176,270 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
        r.out.sids = &sids;
 
        status = dcerpc_lsa_LookupNames(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+
+       if (NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) || 
+           NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
+               for (i=0;i< tnames->count;i++) {
+                       if (i < count && sids.sids[i].sid_type == SID_NAME_UNKNOWN) {
+                               printf("LookupName of %s was unmapped\n", 
+                                      tnames->names[i].name.string);   
+                       } else if (i >=count) {
+                               printf("LookupName of %s failed to return a result\n",
+                                      tnames->names[i].name.string);
+                       }
+               }
+               printf("LookupNames failed - %s\n", nt_errstr(status));
+               return false;
+       } else if (!NT_STATUS_IS_OK(status)) {
+               printf("LookupNames failed - %s\n", nt_errstr(status));
+               return false;
+       }
+       
+       for (i=0;i< tnames->count;i++) {
+               if (i < count && sids.sids[i].sid_type != tnames->names[i].sid_type) {
+                       printf("LookupName of %s got unexpected name type: %s\n", 
+                              tnames->names[i].name.string, sid_type_lookup(sids.sids[i].sid_type));
+               } else if (i >=count) {
+                       printf("LookupName of %s failed to return a result\n",
+                              tnames->names[i].name.string);
+               }
+       }
+       printf("\n");
+
+       return true;
+}
+
+static bool test_LookupNames_bogus(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct policy_handle *handle)
+{
+       struct lsa_LookupNames r;
+       struct lsa_TransSidArray sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       struct lsa_TranslatedName name;
+       struct lsa_TransNameArray tnames;
+
+       tnames.names = &name;
+       tnames.count = 1;
+       name.name.string = "NT AUTHORITY\\BOGUS";
+
+       printf("\nTesting LookupNames with bogus names\n");
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array(mem_ctx, struct lsa_String, tnames.count);
+       for (i=0;i<tnames.count;i++) {
+               init_lsa_String(&names[i], tnames.names[i].name.string);
+       }
+
+       r.in.handle = handle;
+       r.in.num_names = tnames.count;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.out.count = &count;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_LookupNames(p, mem_ctx, &r);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
                printf("LookupNames failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
-       return True;
+       return true;
+}
+
+static bool test_LookupNames_wellknown(struct dcerpc_pipe *p, 
+                                      TALLOC_CTX *mem_ctx, 
+                                      struct policy_handle *handle)
+{
+       struct lsa_TranslatedName name;
+       struct lsa_TransNameArray tnames;
+       bool ret = true;
+
+       printf("Testing LookupNames with well known names\n");
+
+       tnames.names = &name;
+       tnames.count = 1;
+       name.name.string = "NT AUTHORITY\\SYSTEM";
+       name.sid_type = SID_NAME_WKN_GRP;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+       name.name.string = "NT AUTHORITY\\ANONYMOUS LOGON";
+       name.sid_type = SID_NAME_WKN_GRP;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+       name.name.string = "NT AUTHORITY\\Authenticated Users";
+       name.sid_type = SID_NAME_WKN_GRP;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+#if 0
+       name.name.string = "NT AUTHORITY";
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+       name.name.string = "NT AUTHORITY\\";
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+#endif
+
+       name.name.string = "BUILTIN\\";
+       name.sid_type = SID_NAME_DOMAIN;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+       name.name.string = "BUILTIN\\Administrators";
+       name.sid_type = SID_NAME_ALIAS;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+       name.name.string = "SYSTEM";
+       name.sid_type = SID_NAME_WKN_GRP;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+
+       name.name.string = "Everyone";
+       name.sid_type = SID_NAME_WKN_GRP;
+       ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+       return ret;
 }
 
+static bool test_LookupNames2(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle,
+                             struct lsa_TransNameArray2 *tnames)
+{
+       struct lsa_LookupNames2 r;
+       struct lsa_TransSidArray2 sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       printf("\nTesting LookupNames2 with %d names\n", tnames->count);
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array(mem_ctx, struct lsa_String, tnames->count);
+       for (i=0;i<tnames->count;i++) {
+               init_lsa_String(&names[i], tnames->names[i].name.string);
+       }
+
+       r.in.handle = handle;
+       r.in.num_names = tnames->count;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_LookupNames2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("LookupNames2 failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       printf("\n");
 
-static BOOL test_LookupSids(struct dcerpc_pipe *p, 
+       return true;
+}
+
+
+static bool test_LookupNames3(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle,
+                             struct lsa_TransNameArray2 *tnames)
+{
+       struct lsa_LookupNames3 r;
+       struct lsa_TransSidArray3 sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       printf("\nTesting LookupNames3 with %d names\n", tnames->count);
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array(mem_ctx, struct lsa_String, tnames->count);
+       for (i=0;i<tnames->count;i++) {
+               init_lsa_String(&names[i], tnames->names[i].name.string);
+       }
+
+       r.in.handle = handle;
+       r.in.num_names = tnames->count;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_LookupNames3(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("LookupNames3 failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       printf("\n");
+
+       return true;
+}
+
+static bool test_LookupNames4(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct lsa_TransNameArray2 *tnames)
+{
+       struct lsa_LookupNames4 r;
+       struct lsa_TransSidArray3 sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       printf("\nTesting LookupNames4 with %d names\n", tnames->count);
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array(mem_ctx, struct lsa_String, tnames->count);
+       for (i=0;i<tnames->count;i++) {
+               init_lsa_String(&names[i], tnames->names[i].name.string);
+       }
+
+       r.in.num_names = tnames->count;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_LookupNames4(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("LookupNames4 failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       printf("\n");
+
+       return true;
+}
+
+
+static bool test_LookupSids(struct dcerpc_pipe *p, 
                            TALLOC_CTX *mem_ctx, 
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
@@ -167,26 +463,113 @@ static BOOL test_LookupSids(struct dcerpc_pipe *p,
        r.out.names = &names;
 
        status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+       if (!NT_STATUS_IS_OK(status)) {
                printf("LookupSids failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
        if (!test_LookupNames(p, mem_ctx, handle, &names)) {
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
-static BOOL test_many_LookupSids(struct dcerpc_pipe *p, 
-                                TALLOC_CTX *mem_ctx, 
-                                struct policy_handle *handle)
+
+static bool test_LookupSids2(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct policy_handle *handle,
+                           struct lsa_SidArray *sids)
+{
+       struct lsa_LookupSids2 r;
+       struct lsa_TransNameArray2 names;
+       uint32_t count = sids->num_sids;
+       NTSTATUS status;
+
+       printf("\nTesting LookupSids2\n");
+
+       names.count = 0;
+       names.names = NULL;
+
+       r.in.handle = handle;
+       r.in.sids = sids;
+       r.in.names = &names;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.names = &names;
+
+       status = dcerpc_lsa_LookupSids2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("LookupSids2 failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       printf("\n");
+
+       if (!test_LookupNames2(p, mem_ctx, handle, &names)) {
+               return false;
+       }
+
+       if (!test_LookupNames3(p, mem_ctx, handle, &names)) {
+               return false;
+       }
+
+       return true;
+}
+
+static bool test_LookupSids3(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct lsa_SidArray *sids)
+{
+       struct lsa_LookupSids3 r;
+       struct lsa_TransNameArray2 names;
+       uint32_t count = sids->num_sids;
+       NTSTATUS status;
+
+       printf("\nTesting LookupSids3\n");
+
+       names.count = 0;
+       names.names = NULL;
+
+       r.in.sids = sids;
+       r.in.names = &names;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.names = &names;
+
+       status = dcerpc_lsa_LookupSids3(p, mem_ctx, &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)) {
+                       printf("not considering %s to be an error\n", nt_errstr(status));
+                       return true;
+               }
+               printf("LookupSids3 failed - %s - not considered an error\n", 
+                      nt_errstr(status));
+               return false;
+       }
+
+       printf("\n");
+
+       if (!test_LookupNames4(p, mem_ctx, &names)) {
+               return false;
+       }
+
+       return true;
+}
+
+bool test_many_LookupSids(struct dcerpc_pipe *p, 
+                         TALLOC_CTX *mem_ctx, 
+                         struct policy_handle *handle)
 {
-       struct lsa_LookupSids r;
-       struct lsa_TransNameArray names;
        uint32_t count;
        NTSTATUS status;
        struct lsa_SidArray sids;
@@ -194,12 +577,9 @@ static BOOL test_many_LookupSids(struct dcerpc_pipe *p,
 
        printf("\nTesting LookupSids with lots of SIDs\n");
 
-       names.count = 0;
-       names.names = NULL;
-
-       sids.num_sids = 1000;
+       sids.num_sids = 100;
 
-       sids.sids = talloc_array_p(mem_ctx, struct lsa_SidPtr, sids.num_sids);
+       sids.sids = talloc_array(mem_ctx, struct lsa_SidPtr, sids.num_sids);
 
        for (i=0; i<sids.num_sids; i++) {
                const char *sidstr = "S-1-5-32-545";
@@ -208,30 +588,176 @@ static BOOL test_many_LookupSids(struct dcerpc_pipe *p,
 
        count = sids.num_sids;
 
-       r.in.handle = handle;
-       r.in.sids = &sids;
-       r.in.names = &names;
-       r.in.level = 1;
-       r.in.count = &names.count;
-       r.out.count = &count;
-       r.out.names = &names;
+       if (handle) {
+               struct lsa_LookupSids r;
+               struct lsa_TransNameArray names;
+               names.count = 0;
+               names.names = NULL;
 
-       status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
-               printf("LookupSids failed - %s\n", nt_errstr(status));
-               return False;
+               r.in.handle = handle;
+               r.in.sids = &sids;
+               r.in.names = &names;
+               r.in.level = 1;
+               r.in.count = &names.count;
+               r.out.count = &count;
+               r.out.names = &names;
+               
+               status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("LookupSids failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+               
+               printf("\n");
+               
+               if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+                       return false;
+               }
+       } else if (p->conn->security_state.auth_info->auth_type == DCERPC_AUTH_TYPE_SCHANNEL &&
+                  p->conn->security_state.auth_info->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY) {
+               struct lsa_LookupSids3 r;
+               struct lsa_TransNameArray2 names;
+
+               names.count = 0;
+               names.names = NULL;
+
+               printf("\nTesting LookupSids3\n");
+               
+               r.in.sids = &sids;
+               r.in.names = &names;
+               r.in.level = 1;
+               r.in.count = &count;
+               r.in.unknown1 = 0;
+               r.in.unknown2 = 0;
+               r.out.count = &count;
+               r.out.names = &names;
+               
+               status = dcerpc_lsa_LookupSids3(p, mem_ctx, &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)) {
+                               printf("not considering %s to be an error\n", nt_errstr(status));
+                               return true;
+                       }
+                       printf("LookupSids3 failed - %s\n", 
+                              nt_errstr(status));
+                       return false;
+               }
+               if (!test_LookupNames4(p, mem_ctx, &names)) {
+                       return false;
+               }
        }
 
        printf("\n");
 
-       if (!test_LookupNames(p, mem_ctx, handle, &names)) {
-               return False;
+
+
+       return true;
+}
+
+static void lookupsids_cb(struct rpc_request *req)
+{
+       int *replies = (int *)req->async.private_data;
+       NTSTATUS status;
+
+       status = dcerpc_ndr_request_recv(req);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("lookupsids returned %s\n", nt_errstr(status));
+               *replies = -1;
+       }
+
+       if (*replies >= 0) {
+               *replies += 1;
+       }
+}
+
+static bool test_LookupSids_async(struct dcerpc_pipe *p, 
+                                 TALLOC_CTX *mem_ctx, 
+                                 struct policy_handle *handle)
+{
+       struct lsa_SidArray sids;
+       struct lsa_SidPtr sidptr;
+       uint32_t *count;
+       struct lsa_TransNameArray *names;
+       struct lsa_LookupSids *r;
+       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);
+
+       printf("\nTesting %d async lookupsids request\n", num_async_requests);
+
+       req = talloc_array(mem_ctx, 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");
+
+       replies = 0;
+
+       for (i=0; i<num_async_requests; i++) {
+               count[i] = 0;
+               names[i].count = 0;
+               names[i].names = NULL;
+
+               r[i].in.handle = handle;
+               r[i].in.sids = &sids;
+               r[i].in.names = &names[i];
+               r[i].in.level = 1;
+               r[i].in.count = &names[i].count;
+               r[i].out.count = &count[i];
+               r[i].out.names = &names[i];
+               
+               req[i] = dcerpc_lsa_LookupSids_send(p, req, &r[i]);
+               if (req[i] == NULL) {
+                       ret = false;
+                       break;
+               }
+
+               req[i]->async.callback = lookupsids_cb;
+               req[i]->async.private_data = &replies;
+       }
+
+       while (replies >= 0 && replies < num_async_requests) {
+               event_loop_once(p->conn->event_ctx);
+       }
+
+       talloc_free(req);
+
+       if (replies < 0) {
+               ret = false;
        }
 
-       return True;
+       return ret;
 }
 
-static BOOL test_LookupPrivName(struct dcerpc_pipe *p, 
+static bool test_LookupPrivValue(struct dcerpc_pipe *p, 
+                                TALLOC_CTX *mem_ctx, 
+                                struct policy_handle *handle,
+                                struct lsa_String *name)
+{
+       NTSTATUS status;
+       struct lsa_LookupPrivValue r;
+       struct lsa_LUID luid;
+
+       r.in.handle = handle;
+       r.in.name = name;
+       r.out.luid = &luid;
+
+       status = dcerpc_lsa_LookupPrivValue(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("\nLookupPrivValue failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       return true;
+}
+
+static bool test_LookupPrivName(struct dcerpc_pipe *p, 
                                TALLOC_CTX *mem_ctx, 
                                struct policy_handle *handle,
                                struct lsa_LUID *luid)
@@ -245,19 +771,81 @@ static BOOL test_LookupPrivName(struct dcerpc_pipe *p,
        status = dcerpc_lsa_LookupPrivName(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("\nLookupPrivName failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
+       }
+
+       return true;
+}
+
+static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p, 
+                                            TALLOC_CTX *mem_ctx,                                 
+                                            struct policy_handle *acct_handle,
+                                            struct lsa_LUID *luid)
+{
+       NTSTATUS status;
+       struct lsa_RemovePrivilegesFromAccount r;
+       struct lsa_PrivilegeSet privs;
+       bool ret = true;
+
+       printf("Testing RemovePrivilegesFromAccount\n");
+
+       r.in.handle = acct_handle;
+       r.in.remove_all = 0;
+       r.in.privs = &privs;
+
+       privs.count = 1;
+       privs.unknown = 0;
+       privs.set = talloc_array(mem_ctx, struct lsa_LUIDAttribute, 1);
+       privs.set[0].luid = *luid;
+       privs.set[0].attribute = 0;
+
+       status = dcerpc_lsa_RemovePrivilegesFromAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("RemovePrivilegesFromAccount failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       return ret;
+}
+
+static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p, 
+                                       TALLOC_CTX *mem_ctx,                              
+                                       struct policy_handle *acct_handle,
+                                       struct lsa_LUID *luid)
+{
+       NTSTATUS status;
+       struct lsa_AddPrivilegesToAccount r;
+       struct lsa_PrivilegeSet privs;
+       bool ret = true;
+
+       printf("Testing 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[0].luid = *luid;
+       privs.set[0].attribute = 0;
+
+       status = dcerpc_lsa_AddPrivilegesToAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("AddPrivilegesToAccount failed - %s\n", nt_errstr(status));
+               return false;
        }
 
-       return True;
+       return ret;
 }
 
-static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p, 
+static bool test_EnumPrivsAccount(struct dcerpc_pipe *p, 
                                  TALLOC_CTX *mem_ctx,                            
                                  struct policy_handle *handle,
                                  struct policy_handle *acct_handle)
 {
        NTSTATUS status;
        struct lsa_EnumPrivsAccount r;
+       bool ret = true;
 
        printf("Testing EnumPrivsAccount\n");
 
@@ -266,43 +854,66 @@ static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p,
        status = dcerpc_lsa_EnumPrivsAccount(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumPrivsAccount failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
-       if (r.out.privs) {
+       if (r.out.privs && r.out.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);
                }
+
+               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);
        }
 
-       return True;
+       return ret;
 }
 
-static BOOL test_Delete(struct dcerpc_pipe *p, 
+static bool test_Delete(struct dcerpc_pipe *p, 
                       TALLOC_CTX *mem_ctx, 
                       struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_Delete r;
 
-       printf("\ntesting Delete\n");
+       printf("testing Delete\n");
 
        r.in.handle = handle;
        status = dcerpc_lsa_Delete(p, mem_ctx, &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, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_DeleteObject r;
+
+       printf("testing DeleteObject\n");
+
+       r.in.handle = handle;
+       r.out.handle = handle;
+       status = dcerpc_lsa_DeleteObject(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Delete failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
-       printf("\n");
-
-       return True;
+       return true;
 }
 
 
-static BOOL test_CreateAccount(struct dcerpc_pipe *p, 
+static bool test_CreateAccount(struct dcerpc_pipe *p, 
                               TALLOC_CTX *mem_ctx, 
                               struct policy_handle *handle)
 {
@@ -317,59 +928,91 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p,
 
        r.in.handle = handle;
        r.in.sid = newsid;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       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)) {
+       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, mem_ctx, &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;
+               return false;
        }
 
        if (!test_Delete(p, mem_ctx, &acct_handle)) {
-               return False;
+               return false;
        }
 
-       return True;
-}
+       if (!test_DeleteObject(p, mem_ctx, &acct_handle)) {
+               return false;
+       }
 
+       return true;
+}
 
-static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p, 
+static bool test_DeleteTrustedDomain(struct dcerpc_pipe *p, 
                                     TALLOC_CTX *mem_ctx, 
-                                    struct policy_handle *handle)
+                                    struct policy_handle *handle,
+                                    struct lsa_StringLarge name)
 {
        NTSTATUS status;
-       struct lsa_CreateTrustedDomain r;
-       struct lsa_TrustInformation trustinfo;
-       struct dom_sid *domsid;
-       struct policy_handle dom_handle;
+       struct lsa_OpenTrustedDomainByName r;
+       struct policy_handle trustdom_handle;
 
-       printf("Testing CreateTrustedDomain\n");
+       r.in.handle = handle;
+       r.in.name.string = name.string;
+       r.in.access_mask = SEC_STD_DELETE;
+       r.out.trustdom_handle = &trustdom_handle;
 
-       domsid = dom_sid_parse_talloc(mem_ctx, "S-1-5-21-97398-379795-12345");
+       status = dcerpc_lsa_OpenTrustedDomainByName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("lsa_OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       if (!test_Delete(p, mem_ctx, &trustdom_handle)) {
+               return false;
+       }
+
+       if (!test_DeleteObject(p, mem_ctx, &trustdom_handle)) {
+               return false;
+       }
+
+       return true;
+}
 
-       trustinfo.sid = domsid;
-       init_lsa_Name(&trustinfo.name, "torturedomain");
+static bool test_DeleteTrustedDomainBySid(struct dcerpc_pipe *p, 
+                                         TALLOC_CTX *mem_ctx, 
+                                         struct policy_handle *handle,
+                                         struct dom_sid *sid)
+{
+       NTSTATUS status;
+       struct lsa_DeleteTrustedDomain r;
 
        r.in.handle = handle;
-       r.in.info = &trustinfo;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r.out.dom_handle = &dom_handle;
+       r.in.dom_sid = sid;
 
-       status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
+       status = dcerpc_lsa_DeleteTrustedDomain(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateTrustedDomain failed - %s\n", nt_errstr(status));
-               return False;
+               printf("lsa_DeleteTrustedDomain failed - %s\n", nt_errstr(status));
+               return false;
        }
 
-       if (!test_Delete(p, mem_ctx, &dom_handle)) {
-               return False;
-       }
-
-       return True;
+       return true;
 }
 
-static BOOL test_CreateSecret(struct dcerpc_pipe *p, 
+
+static bool test_CreateSecret(struct dcerpc_pipe *p, 
                              TALLOC_CTX *mem_ctx, 
                              struct policy_handle *handle)
 {
@@ -378,120 +1021,339 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
        struct lsa_OpenSecret r2;
        struct lsa_SetSecret r3;
        struct lsa_QuerySecret r4;
-       struct policy_handle sec_handle, sec_handle2;
-       struct lsa_Delete d;
+       struct lsa_SetSecret r5;
+       struct lsa_QuerySecret r6;
+       struct lsa_SetSecret r7;
+       struct lsa_QuerySecret r8;
+       struct policy_handle sec_handle, sec_handle2, sec_handle3;
+       struct lsa_DeleteObject d_o;
        struct lsa_DATA_BUF buf1;
        struct lsa_DATA_BUF_PTR bufp1;
+       struct lsa_DATA_BUF_PTR bufp2;
        DATA_BLOB enc_key;
-       BOOL ret = True;
+       bool ret = true;
        DATA_BLOB session_key;
        NTTIME old_mtime, new_mtime;
        DATA_BLOB blob1, blob2;
        const char *secret1 = "abcdef12345699qwerty";
        char *secret2;
-       char *secname;
-
-       printf("Testing CreateSecret\n");
-
-       asprintf(&secname, "torturesecret-%u", (uint_t)random());
-
-       init_lsa_Name(&r.in.name, secname);
-
-       r.in.handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r.out.sec_handle = &sec_handle;
-
-       status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateSecret failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r2.in.handle = handle;
-       r2.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r2.in.name = r.in.name;
-       r2.out.sec_handle = &sec_handle2;
-
-       printf("Testing OpenSecret\n");
-
-       status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenSecret failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       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));
-               ret = False;
-       }
-
-       enc_key = sess_encrypt_string(secret1, &session_key);
-
-       r3.in.handle = &sec_handle;
-       r3.in.new_val = &buf1;
-       r3.in.old_val = NULL;
-       r3.in.new_val->data = enc_key.data;
-       r3.in.new_val->length = enc_key.length;
-       r3.in.new_val->size = enc_key.length;
-
-       printf("Testing SetSecret\n");
-
-       status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("SetSecret failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       data_blob_free(&enc_key);
-
-       ZERO_STRUCT(new_mtime);
-       ZERO_STRUCT(old_mtime);
-
-       /* fetch the secret back again */
-       r4.in.handle = &sec_handle;
-       r4.in.new_val = &bufp1;
-       r4.in.new_mtime = &new_mtime;
-       r4.in.old_val = NULL;
-       r4.in.old_mtime = NULL;
-
-       bufp1.buf = NULL;
-
-       status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r4);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("QuerySecret failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       blob1.data = r4.out.new_val->buf->data;
-       blob1.length = r4.out.new_val->buf->length;
-
-       blob2 = data_blob(NULL, blob1.length);
+       const char *secret3 = "ABCDEF12345699QWERTY";
+       char *secret4;
+       const char *secret5 = "NEW-SAMBA4-SECRET";
+       char *secret6;
+       char *secname[2];
+       int i;
+       const int LOCAL = 0;
+       const int GLOBAL = 1;
 
-       secret2 = sess_decrypt_string(&blob1, &session_key);
+       secname[LOCAL] = talloc_asprintf(mem_ctx, "torturesecret-%u", (uint_t)random());
+       secname[GLOBAL] = talloc_asprintf(mem_ctx, "G$torturesecret-%u", (uint_t)random());
 
-       printf("returned secret '%s'\n", secret2);
+       for (i=0; i< 2; i++) {
+               printf("Testing CreateSecret of %s\n", secname[i]);
+               
+               init_lsa_String(&r.in.name, secname[i]);
+               
+               r.in.handle = handle;
+               r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               r.out.sec_handle = &sec_handle;
+               
+               status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("CreateSecret failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+               
+               r.in.handle = handle;
+               r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               r.out.sec_handle = &sec_handle3;
+               
+               status = dcerpc_lsa_CreateSecret(p, mem_ctx, &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;
+               }
+               
+               r2.in.handle = handle;
+               r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               r2.in.name = r.in.name;
+               r2.out.sec_handle = &sec_handle2;
+               
+               printf("Testing OpenSecret\n");
+               
+               status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("OpenSecret failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+               
+               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;
+               }
+               
+               enc_key = sess_encrypt_string(secret1, &session_key);
+               
+               r3.in.sec_handle = &sec_handle;
+               r3.in.new_val = &buf1;
+               r3.in.old_val = NULL;
+               r3.in.new_val->data = enc_key.data;
+               r3.in.new_val->length = enc_key.length;
+               r3.in.new_val->size = enc_key.length;
+               
+               printf("Testing SetSecret\n");
+               
+               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("SetSecret failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+               
+               r3.in.sec_handle = &sec_handle;
+               r3.in.new_val = &buf1;
+               r3.in.old_val = NULL;
+               r3.in.new_val->data = enc_key.data;
+               r3.in.new_val->length = enc_key.length;
+               r3.in.new_val->size = enc_key.length;
+               
+               /* break the encrypted data */
+               enc_key.data[0]++;
+
+               printf("Testing SetSecret with broken key\n");
+               
+               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_UNKNOWN_REVISION)) {
+                       printf("SetSecret should have failed UNKNOWN_REVISION - %s\n", nt_errstr(status));
+                       ret = false;
+               }
+               
+               data_blob_free(&enc_key);
+               
+               ZERO_STRUCT(new_mtime);
+               ZERO_STRUCT(old_mtime);
+               
+               /* fetch the secret back again */
+               r4.in.sec_handle = &sec_handle;
+               r4.in.new_val = &bufp1;
+               r4.in.new_mtime = &new_mtime;
+               r4.in.old_val = NULL;
+               r4.in.old_mtime = NULL;
+               
+               bufp1.buf = NULL;
+               
+               printf("Testing QuerySecret\n");
+               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r4);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QuerySecret failed - %s\n", nt_errstr(status));
+                       ret = false;
+               } else {
+                       if (r4.out.new_val == NULL || r4.out.new_val->buf == NULL) {
+                               printf("No secret buffer returned\n");
+                               ret = false;
+                       } else {
+                               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);
+                               
+                               secret2 = sess_decrypt_string(mem_ctx, 
+                                                             &blob1, &session_key);
+                               
+                               if (strcmp(secret1, secret2) != 0) {
+                                       printf("Returned secret (r4) '%s' doesn't match '%s'\n", 
+                                              secret2, secret1);
+                                       ret = false;
+                               }
+                       }
+               }
+               
+               enc_key = sess_encrypt_string(secret3, &session_key);
+               
+               r5.in.sec_handle = &sec_handle;
+               r5.in.new_val = &buf1;
+               r5.in.old_val = NULL;
+               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);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("SetSecret failed - %s\n", nt_errstr(status));
+                       ret = false;
+               }
+               
+               data_blob_free(&enc_key);
+               
+               ZERO_STRUCT(new_mtime);
+               ZERO_STRUCT(old_mtime);
+               
+               /* fetch the secret back again */
+               r6.in.sec_handle = &sec_handle;
+               r6.in.new_val = &bufp1;
+               r6.in.new_mtime = &new_mtime;
+               r6.in.old_val = &bufp2;
+               r6.in.old_mtime = &old_mtime;
+               
+               bufp1.buf = NULL;
+               bufp2.buf = NULL;
+               
+               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r6);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QuerySecret failed - %s\n", nt_errstr(status));
+                       ret = false;
+                       secret4 = NULL;
+               } else {
+
+                       if (r6.out.new_val->buf == NULL || r6.out.old_val->buf == NULL 
+                               || r6.out.new_mtime == NULL || r6.out.old_mtime == NULL) {
+                               printf("Both secret buffers and both times not returned\n");
+                               ret = false;
+                               secret4 = NULL;
+                       } else {
+                               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);
+                               
+                               secret4 = 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 = r6.out.old_val->buf->data;
+                               blob1.length = r6.out.old_val->buf->length;
+                               
+                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
+                               
+                               secret2 = sess_decrypt_string(mem_ctx, 
+                                                             &blob1, &session_key);
+                               
+                               if (strcmp(secret1, secret2) != 0) {
+                                       printf("Returned OLD secret %s doesn't match %s\n", secret2, secret1);
+                                       ret = false;
+                               }
+                               
+                               if (*r6.out.new_mtime == *r6.out.old_mtime) {
+                                       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.old_mtime), 
+                                              nt_time_string(mem_ctx, *r6.out.new_mtime));
+                                       ret = false;
+                               }
+                       }
+               }
 
-       if (strcmp(secret1, secret2) != 0) {
-               printf("Returned secret doesn't match\n");
-               ret = False;
-       }
+               enc_key = sess_encrypt_string(secret5, &session_key);
+               
+               r7.in.sec_handle = &sec_handle;
+               r7.in.old_val = &buf1;
+               r7.in.old_val->data = enc_key.data;
+               r7.in.old_val->length = enc_key.length;
+               r7.in.old_val->size = enc_key.length;
+               r7.in.new_val = NULL;
+               
+               printf("Testing SetSecret of old Secret only\n");
+               
+               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r7);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("SetSecret failed - %s\n", nt_errstr(status));
+                       ret = false;
+               }
+               
+               data_blob_free(&enc_key);
+               
+               /* fetch the secret back again */
+               r8.in.sec_handle = &sec_handle;
+               r8.in.new_val = &bufp1;
+               r8.in.new_mtime = &new_mtime;
+               r8.in.old_val = &bufp2;
+               r8.in.old_mtime = &old_mtime;
+               
+               bufp1.buf = NULL;
+               bufp2.buf = NULL;
+               
+               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r8);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QuerySecret failed - %s\n", nt_errstr(status));
+                       ret = false;
+               } else {
+                       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) {
+                               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 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 {
+                               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);
+                               
+                               secret6 = sess_decrypt_string(mem_ctx,
+                                                             &blob1, &session_key);
+                               
+                               if (strcmp(secret5, secret6) != 0) {
+                                       printf("Returned OLD secret %s doesn't match %s\n", secret5, secret6);
+                                       ret = false;
+                               }
+                               
+                               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));
+                                       ret = false;
+                               }
+                       }
+               }
 
-       if (!test_Delete(p, mem_ctx, &sec_handle)) {
-               ret = False;
-       }
+               if (!test_Delete(p, mem_ctx, &sec_handle)) {
+                       ret = false;
+               }
+               
+               if (!test_DeleteObject(p, mem_ctx, &sec_handle)) {
+                       return false;
+               }
 
-       d.in.handle = &sec_handle2;
-       status = dcerpc_lsa_Delete(p, mem_ctx, &d);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
-               printf("Second delete expected INVALID_HANDLE - %s\n", nt_errstr(status));
-               ret = False;
+               d_o.in.handle = &sec_handle2;
+               d_o.out.handle = &sec_handle2;
+               status = dcerpc_lsa_DeleteObject(p, mem_ctx, &d_o);
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+                       printf("Second delete expected INVALID_HANDLE - %s\n", nt_errstr(status));
+                       ret = false;
+               } else {
+
+                       printf("Testing OpenSecret of just-deleted secret\n");
+                       
+                       status = dcerpc_lsa_OpenSecret(p, mem_ctx, &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;
+                       }
+               }
+               
        }
 
        return ret;
 }
 
-static BOOL test_EnumAccountRights(struct dcerpc_pipe *p, 
+
+static bool test_EnumAccountRights(struct dcerpc_pipe *p, 
                                   TALLOC_CTX *mem_ctx, 
                                   struct policy_handle *acct_handle,
                                   struct dom_sid *sid)
@@ -508,37 +1370,43 @@ static BOOL test_EnumAccountRights(struct dcerpc_pipe *p,
 
        status = dcerpc_lsa_EnumAccountRights(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("EnumAccountRights failed - %s\n", nt_errstr(status));
-               return False;
+               printf("EnumAccountRights of %s failed - %s\n", 
+                      dom_sid_string(mem_ctx, sid), nt_errstr(status));
+               return false;
        }
 
-       return True;
+       return true;
 }
 
 
-static BOOL test_QuerySecObj(struct dcerpc_pipe *p, 
-                            TALLOC_CTX *mem_ctx, 
+static bool test_QuerySecurity(struct dcerpc_pipe *p, 
+                            struct torture_context *tctx, 
                             struct policy_handle *handle,
                             struct policy_handle *acct_handle)
 {
        NTSTATUS status;
-       struct lsa_QuerySecObj r;
+       struct lsa_QuerySecurity r;
+
+       if (torture_setting_bool(tctx, "samba4", false)) {
+               printf("skipping QuerySecurity test against Samba4\n");
+               return true;
+       }
 
-       printf("Testing QuerySecObj\n");
+       printf("Testing QuerySecurity\n");
 
        r.in.handle = acct_handle;
        r.in.sec_info = 7;
 
-       status = dcerpc_lsa_QuerySecObj(p, mem_ctx, &r);
+       status = dcerpc_lsa_QuerySecurity(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("QuerySecObj failed - %s\n", nt_errstr(status));
-               return False;
+               printf("QuerySecurity failed - %s\n", nt_errstr(status));
+               return false;
        }
 
-       return True;
+       return true;
 }
 
-static BOOL test_OpenAccount(struct dcerpc_pipe *p, 
+static bool test_OpenAccount(struct dcerpc_pipe *p, 
                             TALLOC_CTX *mem_ctx, 
                             struct policy_handle *handle,
                             struct dom_sid *sid)
@@ -551,27 +1419,27 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
 
        r.in.handle = handle;
        r.in.sid = sid;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
        status = dcerpc_lsa_OpenAccount(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("OpenAccount failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        if (!test_EnumPrivsAccount(p, mem_ctx, handle, &acct_handle)) {
-               return False;
+               return false;
        }
 
-       if (!test_QuerySecObj(p, mem_ctx, handle, &acct_handle)) {
-               return False;
+       if (!test_QuerySecurity(p, mem_ctx, handle, &acct_handle)) {
+               return false;
        }
 
-       return True;
+       return true;
 }
 
-static BOOL test_EnumAccounts(struct dcerpc_pipe *p, 
+static bool test_EnumAccounts(struct dcerpc_pipe *p, 
                          TALLOC_CTX *mem_ctx, 
                          struct policy_handle *handle)
 {
@@ -580,6 +1448,7 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        struct lsa_SidArray sids1, sids2;
        uint32_t resume_handle = 0;
        int i;
+       bool ret = true;
 
        printf("\ntesting EnumAccounts\n");
 
@@ -590,25 +1459,38 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        r.out.sids = &sids1;
 
        resume_handle = 0;
-       status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("EnumAccounts failed - %s\n", nt_errstr(status));
-               return False;
-       }
+       while (true) {
+               status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+                       break;
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("EnumAccounts failed - %s\n", nt_errstr(status));
+                       return false;
+               }
 
-       if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
-               return False;
-       }
+               if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
+                       return false;
+               }
+
+               if (!test_LookupSids2(p, mem_ctx, handle, &sids1)) {
+                       return false;
+               }
 
-       printf("testing all accounts\n");
-       for (i=0;i<sids1.num_sids;i++) {
-               test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
-               test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
+               /* 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");
+               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);
+               }
+               printf("\n");
        }
-       printf("\n");
 
        if (sids1.num_sids < 3) {
-               return True;
+               return ret;
        }
        
        printf("trying EnumAccounts partial listing (asking for 1 at 2)\n");
@@ -619,19 +1501,82 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumAccounts failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        if (sids2.num_sids != 1) {
                printf("Returned wrong number of entries (%d)\n", sids2.num_sids);
-               return False;
+               return false;
+       }
+
+       return true;
+}
+
+static bool test_LookupPrivDisplayName(struct dcerpc_pipe *p,
+                               TALLOC_CTX *mem_ctx,
+                               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;
+
+       printf("testing 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;
+
+       status = dcerpc_lsa_LookupPrivDisplayName(p, mem_ctx, &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);
+
+       return true;
+}
+
+static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p, 
+                               TALLOC_CTX *mem_ctx,
+                               struct policy_handle *handle,
+                               struct lsa_String *priv_name)
+{
+       struct lsa_EnumAccountsWithUserRight r;
+       struct lsa_SidArray sids;
+       NTSTATUS status;
+
+       ZERO_STRUCT(sids);
+       
+       printf("testing 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);
+
+       /* NT_STATUS_NO_MORE_ENTRIES means noone has this privilege */
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+               return true;
        }
 
-       return True;
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumAccountsWithUserRight failed - %s\n", nt_errstr(status));
+               return false;
+       }
+       
+       return true;
 }
 
 
-static BOOL test_EnumPrivs(struct dcerpc_pipe *p, 
+static bool test_EnumPrivs(struct dcerpc_pipe *p, 
                           TALLOC_CTX *mem_ctx, 
                           struct policy_handle *handle)
 {
@@ -639,12 +1584,14 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
        struct lsa_EnumPrivs r;
        struct lsa_PrivArray privs1;
        uint32_t resume_handle = 0;
+       int i;
+       bool ret = true;
 
        printf("\ntesting EnumPrivs\n");
 
        r.in.handle = handle;
        r.in.resume_handle = &resume_handle;
-       r.in.max_count = 1000;
+       r.in.max_count = 100;
        r.out.resume_handle = &resume_handle;
        r.out.privs = &privs1;
 
@@ -652,53 +1599,477 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
        status = dcerpc_lsa_EnumPrivs(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("EnumPrivs failed - %s\n", nt_errstr(status));
-               return False;
+               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)) {
+                       ret = false;
+               }
+       }
+
+       return ret;
+}
+
+static bool test_QueryForestTrustInformation(struct dcerpc_pipe *p, 
+                                            struct torture_context *tctx, 
+                                            struct policy_handle *handle,
+                                            const char *trusted_domain_name)
+{
+       bool ret = true;
+       struct lsa_lsaRQueryForestTrustInformation r;
+       NTSTATUS status;
+       struct lsa_String string;
+       struct lsa_ForestTrustInformation info, *info_ptr;
+
+       printf("\nTesting lsaRQueryForestTrustInformation\n");
+
+       if (torture_setting_bool(tctx, "samba4", false)) {
+               printf("skipping QueryForestTrustInformation against Samba4\n");
+               return true;
+       }
+
+       ZERO_STRUCT(string);
+
+       if (trusted_domain_name) {
+               init_lsa_String(&string, trusted_domain_name);
+       }
+
+       info_ptr = &info;
+
+       r.in.handle = handle;
+       r.in.trusted_domain_name = &string;
+       r.in.unknown = 0;
+       r.out.forest_trust_info = &info_ptr;
+
+       status = dcerpc_lsa_lsaRQueryForestTrustInformation(p, tctx, &r);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("lsaRQueryForestTrustInformation failed - %s\n", nt_errstr(status));
+               ret = false;
+       }
+
+       return ret;
+}
+
+static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p, 
+                                      TALLOC_CTX *mem_ctx, 
+                                      struct policy_handle *handle, 
+                                      struct lsa_DomainListEx *domains) 
+{
+       int i;
+       bool ret = true;
+
+       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, 
+                                                               domains->domains[i].domain_name.string);
+               }
        }
 
-       return True;
+       return ret;
 }
 
+static bool test_query_each_TrustDom(struct dcerpc_pipe *p, 
+                                    TALLOC_CTX *mem_ctx, 
+                                    struct policy_handle *handle, 
+                                    struct lsa_DomainList *domains) 
+{
+       NTSTATUS status;
+       int i,j;
+       bool ret = true;
+               
+       printf("\nTesting OpenTrustedDomain, OpenTrustedDomainByName and QueryInfoTrustedDomain\n");
+       for (i=0; i< domains->count; i++) {
+               struct lsa_OpenTrustedDomain trust;
+               struct lsa_OpenTrustedDomainByName trust_by_name;
+               struct policy_handle trustdom_handle;
+               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, 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;
+                       trust.in.sid = domains->domains[i].sid;
+                       trust.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+                       trust.out.trustdom_handle = &trustdom_handle;
+                       
+                       status = dcerpc_lsa_OpenTrustedDomain(p, mem_ctx, &trust);
+                       
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("OpenTrustedDomain failed - %s\n", nt_errstr(status));
+                               return false;
+                       }
+                       
+                       c.in.handle = &trustdom_handle;
+                       c.out.handle = &handle2;
+                       
+                       c_trust.in.handle = &trustdom_handle;
+                       c_trust.out.handle = &handle2;
+                       
+                       for (j=0; j < ARRAY_SIZE(levels); j++) {
+                               struct lsa_QueryTrustedDomainInfo q;
+                               union lsa_TrustedDomainInfo info;
+                               q.in.trustdom_handle = &trustdom_handle;
+                               q.in.level = levels[j];
+                               q.out.info = &info;
+                               status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                               if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                                       printf("QueryTrustedDomainInfo level %d failed - %s\n", 
+                                              levels[j], nt_errstr(status));
+                                       ret = false;
+                               } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                                       printf("QueryTrustedDomainInfo level %d unexpectedly succeeded - %s\n", 
+                                              levels[j], nt_errstr(status));
+                                       ret = false;
+                               }
+                       }
+                       
+                       status = dcerpc_lsa_CloseTrustedDomainEx(p, mem_ctx, &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;
+                       }
+                       
+                       c.in.handle = &trustdom_handle;
+                       c.out.handle = &handle2;
+                       
+                       status = dcerpc_lsa_Close(p, mem_ctx, &c);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("Close of trusted domain failed - %s\n", nt_errstr(status));
+                               return false;
+                       }
+
+                       for (j=0; j < ARRAY_SIZE(levels); j++) {
+                               struct lsa_QueryTrustedDomainInfoBySid q;
+                               union lsa_TrustedDomainInfo info;
+                               
+                               if (!domains->domains[i].sid) {
+                                       continue;
+                               }
+                               
+                               q.in.handle  = handle;
+                               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);
+                               if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                                       printf("QueryTrustedDomainInfoBySid level %d failed - %s\n", 
+                                              levels[j], nt_errstr(status));
+                                       ret = false;
+                               } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                                       printf("QueryTrustedDomainInfoBySid level %d unexpectedly succeeded - %s\n", 
+                                              levels[j], nt_errstr(status));
+                                       ret = false;
+                               }
+                       }
+               }
+
+               trust_by_name.in.handle = handle;
+               trust_by_name.in.name.string = domains->domains[i].name.string;
+               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);
+                       
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+
+               for (j=0; j < ARRAY_SIZE(levels); j++) {
+                       struct lsa_QueryTrustedDomainInfo q;
+                       union lsa_TrustedDomainInfo info;
+                       q.in.trustdom_handle = &trustdom_handle;
+                       q.in.level = levels[j];
+                       q.out.info = &info;
+                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                       if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                               printf("QueryTrustedDomainInfo level %d failed - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = false;
+                       } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                               printf("QueryTrustedDomainInfo level %d unexpectedly succeeded - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = false;
+                       }
+               }
+               
+               c.in.handle = &trustdom_handle;
+               c.out.handle = &handle2;
+
+               status = dcerpc_lsa_Close(p, mem_ctx, &c);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("Close of trusted domain failed - %s\n", nt_errstr(status));
+                       return false;
+               }
+
+               for (j=0; j < ARRAY_SIZE(levels); j++) {
+                       struct lsa_QueryTrustedDomainInfoByName q;
+                       union lsa_TrustedDomainInfo info;
+                       q.in.handle         = handle;
+                       q.in.trusted_domain.string = domains->domains[i].name.string;
+                       q.in.level          = levels[j];
+                       q.out.info          = &info;
+                       status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, mem_ctx, &q);
+                       if (!NT_STATUS_IS_OK(status) && ok[j]) {
+                               printf("QueryTrustedDomainInfoByName level %d failed - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = false;
+                       } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                               printf("QueryTrustedDomainInfoByName level %d unexpectedly succeeded - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = false;
+                       }
+               }
+       }
+       return ret;
+}
 
-static BOOL test_EnumTrustDom(struct dcerpc_pipe *p, 
+static bool test_EnumTrustDom(struct dcerpc_pipe *p, 
                              TALLOC_CTX *mem_ctx, 
                              struct policy_handle *handle)
 {
        struct lsa_EnumTrustDom r;
-       NTSTATUS status;
+       struct lsa_EnumTrustedDomainsEx r_ex;
+       NTSTATUS enum_status;
        uint32_t resume_handle = 0;
        struct lsa_DomainList domains;
+       struct lsa_DomainListEx domains_ex;
+       bool ret = true;
 
        printf("\nTesting EnumTrustDom\n");
 
        r.in.handle = handle;
        r.in.resume_handle = &resume_handle;
-       r.in.num_entries = 1000;
+       r.in.max_size = 0;
        r.out.domains = &domains;
        r.out.resume_handle = &resume_handle;
+       
+       enum_status = dcerpc_lsa_EnumTrustDom(p, mem_ctx, &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;
+       }
+               
+       do {
+               r.in.handle = handle;
+               r.in.resume_handle = &resume_handle;
+               r.in.max_size = LSA_ENUM_TRUST_DOMAIN_MULTIPLIER * 3;
+               r.out.domains = &domains;
+               r.out.resume_handle = &resume_handle;
+               
+               enum_status = dcerpc_lsa_EnumTrustDom(p, mem_ctx, &r);
+               
+               /* NO_MORE_ENTRIES is allowed */
+               if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
+                       return true;
+               } 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) {
+                               printf("EnumTrustDom didn't fill the buffer we "
+                                      "asked it to (got %d, expected %d / %d == %d entries)\n",
+                                      r.out.domains->count, LSA_ENUM_TRUST_DOMAIN_MULTIPLIER * 3, 
+                                      LSA_ENUM_TRUST_DOMAIN_MULTIPLIER, r.in.max_size);
+                               ret = false;
+                       }
+               } else if (!NT_STATUS_IS_OK(enum_status)) {
+                       printf("EnumTrustDom failed - %s\n", nt_errstr(enum_status));
+                       return false;
+               }
+               
+               if (domains.count == 0) {
+                       printf("EnumTrustDom failed - should have returned 'NT_STATUS_NO_MORE_ENTRIES' for 0 trusted domains\n");
+                       return false;
+               }
 
-       status = dcerpc_lsa_EnumTrustDom(p, mem_ctx, &r);
+               ret &= test_query_each_TrustDom(p, mem_ctx, handle, &domains);
+               
+       } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
 
-       /* NO_MORE_ENTRIES is allowed */
-       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
-               return True;
+       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, mem_ctx, &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;
+               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, mem_ctx, &r_ex);
+               
+               /* NO_MORE_ENTRIES is allowed */
+               if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
+                       return true;
+               } 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) {
+                               printf("EnumTrustDom didn't fill the buffer we "
+                                      "asked it to (got %d, expected %d / %d == %d entries)\n",
+                                      r_ex.out.domains->count, 
+                                      r_ex.in.max_size,
+                                      LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER, 
+                                      r_ex.in.max_size / LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER);
+                       }
+               } else if (!NT_STATUS_IS_OK(enum_status)) {
+                       printf("EnumTrustedDomainEx failed - %s\n", nt_errstr(enum_status));
+                       return false;
+               }
 
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("EnumTrustDom failed - %s\n", nt_errstr(status));
-               return False;
+               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, mem_ctx, handle, &domains_ex);
+               
+       } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
+
+       return ret;
+}
+
+static bool test_CreateTrustedDomain(struct dcerpc_pipe *p, 
+                                    TALLOC_CTX *mem_ctx, 
+                                    struct policy_handle *handle)
+{
+       NTSTATUS status;
+       bool ret = true;
+       struct lsa_CreateTrustedDomain r;
+       struct lsa_DomainInfo trustinfo;
+       struct dom_sid *domsid[12];
+       struct policy_handle trustdom_handle[12];
+       struct lsa_QueryTrustedDomainInfo q;
+       int i;
+
+       printf("Testing CreateTrustedDomain for 12 domains\n");
+
+       if (!test_EnumTrustDom(p, mem_ctx, 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);
+               
+               domsid[i] = dom_sid_parse_talloc(mem_ctx, trust_sid);
+
+               trustinfo.sid = domsid[i];
+               init_lsa_String((struct lsa_String *)&trustinfo.name, trust_name);
+
+               r.in.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);
+               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);
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("CreateTrustedDomain failed - %s\n", nt_errstr(status));
+                       ret = false;
+               } else {
+               
+                       q.in.trustdom_handle = &trustdom_handle[i];
+                       q.in.level = LSA_TRUSTED_DOMAIN_INFO_NAME;
+                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &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(q.out.info->name.netbios_name.string, trustinfo.name.string) != 0) {
+                                       printf("QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n",
+                                              q.out.info->name.netbios_name.string, trustinfo.name.string);
+                                       ret = false;
+                               }
+                       }
+               }
+       }
+
+       /* now that we have some domains to look over, we can test the enum calls */
+       if (!test_EnumTrustDom(p, mem_ctx, handle)) {
+               ret = false;
+       }
+       
+       for (i=0; i<12; i++) {
+               if (!test_DeleteTrustedDomainBySid(p, mem_ctx, handle, domsid[i])) {
+                       ret = false;
+               }
        }
 
-       return True;
+       return ret;
 }
 
-static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, 
-                                TALLOC_CTX *mem_ctx, 
+static bool test_QueryDomainInfoPolicy(struct dcerpc_pipe *p, 
+                                struct torture_context *tctx, 
+                                struct policy_handle *handle)
+{
+       struct lsa_QueryDomainInformationPolicy r;
+       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;
+
+               printf("\ntrying QueryDomainInformationPolicy level %d\n", i);
+
+               status = dcerpc_lsa_QueryDomainInformationPolicy(p, tctx, &r);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QueryDomainInformationPolicy failed - %s\n", nt_errstr(status));
+                       ret = false;
+                       continue;
+               }
+       }
+
+       return ret;
+}
+
+
+static bool test_QueryInfoPolicy(struct dcerpc_pipe *p, 
+                                struct torture_context *tctx, 
                                 struct policy_handle *handle)
 {
        struct lsa_QueryInfoPolicy r;
        NTSTATUS status;
        int i;
-       BOOL ret = True;
+       bool ret = true;
        printf("\nTesting QueryInfoPolicy\n");
 
        for (i=1;i<13;i++) {
@@ -707,61 +2078,160 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p,
 
                printf("\ntrying QueryInfoPolicy level %d\n", i);
 
-               status = dcerpc_lsa_QueryInfoPolicy(p, mem_ctx, &r);
-
-               if ((i == 9 || i == 10 || i == 11) &&
-                   NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
-                       printf("server failed level %u (OK)\n", i);
-                       continue;
+               status = dcerpc_lsa_QueryInfoPolicy(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("QueryInfoPolicy 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("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                                       ret = false;
+                               }
+                       } else if (!NT_STATUS_IS_OK(status)) {
+                               printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                               ret = false;
+                       }
+                       break;
                }
 
-               if (!NT_STATUS_IS_OK(status)) {
-                       printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
-                       ret = False;
-                       continue;
+               if (NT_STATUS_IS_OK(status) && i == LSA_POLICY_INFO_DNS) {
+                       /* 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].sid_type = SID_NAME_DOMAIN;
+                       tnames.names[1].name.string = r.out.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].sid_type = SID_NAME_DOMAIN;
+                       tnames.names[3].name.string = talloc_asprintf(tctx, "%s\\", r.out.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].sid_type = SID_NAME_USER;
+                       tnames.names[5].name.string = talloc_asprintf(tctx, "%s\\krbtgt", r.out.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].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].sid_type = SID_NAME_USER;
+                       tnames.names[8].name.string = talloc_asprintf(tctx, "krbtgt@%s", r.out.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].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].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].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].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].sid_type = SID_NAME_USER;
+                       ret &= test_LookupNames(p, tctx, handle, &tnames);
+
                }
        }
 
        return ret;
 }
 
-static BOOL test_QueryInfoPolicy2(struct dcerpc_pipe *p, 
-                                 TALLOC_CTX *mem_ctx, 
+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;
+       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, mem_ctx, &r);
-
-               if ((i == 9 || i == 10 || i == 11) &&
-                   NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
-                       printf("server failed level %u (OK)\n", i);
-                       continue;
+               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;
                }
+       }
 
-               if (!NT_STATUS_IS_OK(status)) {
-                       printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                       ret = False;
-                       continue;
-               }
+       return ret;
+}
+
+static bool test_GetUserName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       struct lsa_GetUserName r;
+       NTSTATUS status;
+       bool ret = true;
+       struct lsa_StringPointer authority_name_p;
+
+       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;
+
+       status = dcerpc_lsa_GetUserName(p, mem_ctx, &r);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("GetUserName failed - %s\n", nt_errstr(status));
+               ret = false;
        }
 
        return ret;
 }
 
-static BOOL test_Close(struct dcerpc_pipe *p, 
-                      TALLOC_CTX *mem_ctx, 
-                      struct policy_handle *handle)
+bool test_lsa_Close(struct dcerpc_pipe *p, 
+                   TALLOC_CTX *mem_ctx, 
+                   struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_Close r;
@@ -775,96 +2245,140 @@ static BOOL test_Close(struct dcerpc_pipe *p,
        status = dcerpc_lsa_Close(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Close failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        status = dcerpc_lsa_Close(p, mem_ctx, &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));
-               return False;
+               return false;
        }
 
        printf("\n");
 
-       return True;
+       return true;
 }
 
-BOOL torture_rpc_lsa(int dummy)
+bool torture_rpc_lsa(struct torture_context *tctx)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
-       TALLOC_CTX *mem_ctx;
-       BOOL ret = True;
-       struct policy_handle handle;
+       bool ret = true;
+       struct policy_handle *handle;
+       struct test_join *join = NULL;
+       struct cli_credentials *machine_creds;
 
-       mem_ctx = talloc_init("torture_rpc_lsa");
-
-       status = torture_rpc_connection(&p, 
-                                       DCERPC_LSARPC_NAME, 
-                                       DCERPC_LSARPC_UUID, 
-                                       DCERPC_LSARPC_VERSION);
+       status = torture_rpc_connection(tctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
-               return False;
+               return false;
        }
 
-       if (!test_OpenPolicy(p, mem_ctx)) {
-               ret = False;
+       if (!test_OpenPolicy(p, tctx)) {
+               ret = false;
        }
 
-       if (!test_OpenPolicy2(p, mem_ctx, &handle)) {
-               ret = False;
+       if (!test_lsa_OpenPolicy2(p, tctx, &handle)) {
+               ret = false;
        }
 
-       if (!test_many_LookupSids(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       if (handle) {
+               join = torture_join_domain(tctx, TEST_MACHINENAME, ACB_WSTRUST, &machine_creds);
+               if (!join) {
+                       ret = false;
+               }
 
-       if (!test_CreateAccount(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+               if (!test_LookupNames_wellknown(p, tctx, handle)) {
+                       ret = false;
+               }               
 
-       if (!test_CreateSecret(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+               if (!test_LookupNames_bogus(p, tctx, handle)) {
+                       ret = false;
+               }               
 
-       if (!test_CreateTrustedDomain(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+               if (!test_LookupSids_async(p, tctx, handle)) {
+                       ret = false;
+               }
 
-       if (!test_EnumAccounts(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+               if (!test_QueryDomainInfoPolicy(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_CreateAccount(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_CreateSecret(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_CreateTrustedDomain(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_EnumAccounts(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_EnumPrivs(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_QueryInfoPolicy(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_QueryInfoPolicy2(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_Delete(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_many_LookupSids(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               if (!test_lsa_Close(p, tctx, handle)) {
+                       ret = false;
+               }
+               
+               torture_leave_domain(tctx, join);
 
-       if (!test_EnumPrivs(p, mem_ctx, &handle)) {
-               ret = False;
+       } else {
+               if (!test_many_LookupSids(p, tctx, handle)) {
+                       ret = false;
+               }
        }
 
-       if (!test_EnumTrustDom(p, mem_ctx, &handle)) {
-               ret = False;
+       if (!test_GetUserName(p, tctx)) {
+               ret = false;
        }
 
-       if (!test_QueryInfoPolicy(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       return ret;
+}
 
-       if (!test_QueryInfoPolicy2(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-       
-#if 0
-       if (!test_Delete(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-#endif
-       
-       if (!test_Close(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+bool torture_rpc_lsa_get_user(struct torture_context *torture)
+{
+        NTSTATUS status;
+        struct dcerpc_pipe *p;
+       TALLOC_CTX *mem_ctx;
+       bool ret = true;
 
-       talloc_destroy(mem_ctx);
+       mem_ctx = talloc_init("torture_rpc_lsa_get_user");
 
-        torture_rpc_close(p);
+       status = torture_rpc_connection(torture, &p, &ndr_table_lsarpc);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(mem_ctx);
+               return false;
+       }
+
+       if (!test_GetUserName(p, mem_ctx)) {
+               ret = false;
+       }
+               
+       talloc_free(mem_ctx);
 
        return ret;
 }