Update RPC-LSA to (almost) pass against Windows 2008.
[kai/samba.git] / source / torture / rpc / lsa.c
index 5d7ddc6c80fdf7c655892c0186645db7aae1c9e5..98cbf12e6879958f43255dbf9547f125107c93a5 100644 (file)
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    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"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_lsa.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->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;
@@ -63,17 +69,17 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                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;
+                       return true;
                }
                printf("OpenPolicy failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
 
-BOOL test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+bool test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                          struct policy_handle **handle)
 {
        struct lsa_ObjectAttribute attr;
@@ -85,7 +91,7 @@ BOOL test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        *handle = talloc(mem_ctx, struct policy_handle);
        if (!*handle) {
-               return False;
+               return false;
        }
 
        qos.len = 0;
@@ -112,19 +118,37 @@ BOOL test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        printf("not considering %s to be an error\n", nt_errstr(status));
                        talloc_free(*handle);
                        *handle = NULL;
-                       return True;
+                       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;
@@ -153,17 +177,138 @@ 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;
+               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;
        }
 
        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, 
+static bool test_LookupNames2(struct dcerpc_pipe *p, 
                              TALLOC_CTX *mem_ctx, 
                              struct policy_handle *handle,
                              struct lsa_TransNameArray2 *tnames)
@@ -197,18 +342,18 @@ static BOOL test_LookupNames2(struct dcerpc_pipe *p,
        r.out.sids = &sids;
 
        status = dcerpc_lsa_LookupNames2(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+       if (!NT_STATUS_IS_OK(status)) {
                printf("LookupNames2 failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
-       return True;
+       return true;
 }
 
 
-static BOOL test_LookupNames3(struct dcerpc_pipe *p, 
+static bool test_LookupNames3(struct dcerpc_pipe *p, 
                              TALLOC_CTX *mem_ctx, 
                              struct policy_handle *handle,
                              struct lsa_TransNameArray2 *tnames)
@@ -242,17 +387,17 @@ static BOOL test_LookupNames3(struct dcerpc_pipe *p,
        r.out.sids = &sids;
 
        status = dcerpc_lsa_LookupNames3(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+       if (!NT_STATUS_IS_OK(status)) {
                printf("LookupNames3 failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
-       return True;
+       return true;
 }
 
-static BOOL test_LookupNames4(struct dcerpc_pipe *p, 
+static bool test_LookupNames4(struct dcerpc_pipe *p, 
                              TALLOC_CTX *mem_ctx, 
                              struct lsa_TransNameArray2 *tnames)
 {
@@ -284,18 +429,18 @@ static BOOL test_LookupNames4(struct dcerpc_pipe *p,
        r.out.sids = &sids;
 
        status = dcerpc_lsa_LookupNames4(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+       if (!NT_STATUS_IS_OK(status)) {
                printf("LookupNames4 failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
-       return True;
+       return true;
 }
 
 
-static BOOL test_LookupSids(struct dcerpc_pipe *p, 
+static bool test_LookupSids(struct dcerpc_pipe *p, 
                            TALLOC_CTX *mem_ctx, 
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
@@ -319,22 +464,22 @@ 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_LookupSids2(struct dcerpc_pipe *p, 
+static bool test_LookupSids2(struct dcerpc_pipe *p, 
                            TALLOC_CTX *mem_ctx, 
                            struct policy_handle *handle,
                            struct lsa_SidArray *sids)
@@ -360,25 +505,25 @@ static BOOL test_LookupSids2(struct dcerpc_pipe *p,
        r.out.names = &names;
 
        status = dcerpc_lsa_LookupSids2(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+       if (!NT_STATUS_IS_OK(status)) {
                printf("LookupSids2 failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
        if (!test_LookupNames2(p, mem_ctx, handle, &names)) {
-               return False;
+               return false;
        }
 
        if (!test_LookupNames3(p, mem_ctx, handle, &names)) {
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
-static BOOL test_LookupSids3(struct dcerpc_pipe *p, 
+static bool test_LookupSids3(struct dcerpc_pipe *p, 
                            TALLOC_CTX *mem_ctx, 
                            struct lsa_SidArray *sids)
 {
@@ -402,27 +547,27 @@ static BOOL test_LookupSids3(struct dcerpc_pipe *p,
        r.out.names = &names;
 
        status = dcerpc_lsa_LookupSids3(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+       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;
+                       return true;
                }
                printf("LookupSids3 failed - %s - not considered an error\n", 
                       nt_errstr(status));
-               return False;
+               return false;
        }
 
        printf("\n");
 
        if (!test_LookupNames4(p, mem_ctx, &names)) {
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
-BOOL test_many_LookupSids(struct dcerpc_pipe *p, 
+bool test_many_LookupSids(struct dcerpc_pipe *p, 
                          TALLOC_CTX *mem_ctx, 
                          struct policy_handle *handle)
 {
@@ -459,18 +604,18 @@ BOOL test_many_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;
                }
-       } else {
+       } else if (p->conn->security_state.auth_info->auth_type == DCERPC_AUTH_TYPE_SCHANNEL &&
+                  p->conn->security_state.auth_info->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY) {
                struct lsa_LookupSids3 r;
                struct lsa_TransNameArray2 names;
 
@@ -489,18 +634,18 @@ BOOL test_many_LookupSids(struct dcerpc_pipe *p,
                r.out.names = &names;
                
                status = dcerpc_lsa_LookupSids3(p, mem_ctx, &r);
-               if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               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;
+                               return true;
                        }
                        printf("LookupSids3 failed - %s\n", 
                               nt_errstr(status));
-                       return False;
+                       return false;
                }
                if (!test_LookupNames4(p, mem_ctx, &names)) {
-                       return False;
+                       return false;
                }
        }
 
@@ -508,43 +653,46 @@ BOOL test_many_LookupSids(struct dcerpc_pipe *p,
 
 
 
-       return True;
+       return true;
 }
 
-#define NUM_ASYNC_REQUESTS 1000
-
 static void lookupsids_cb(struct rpc_request *req)
 {
-       int *replies = (int *)req->async.private;
+       int *replies = (int *)req->async.private_data;
        NTSTATUS status;
 
        status = dcerpc_ndr_request_recv(req);
-       DEBUG(3, ("lookupsids returned %s\n", nt_errstr(status)));
        if (!NT_STATUS_IS_OK(status)) {
+               printf("lookupsids returned %s\n", nt_errstr(status));
                *replies = -1;
        }
 
-       *replies += 1;
+       if (*replies >= 0) {
+               *replies += 1;
+       }
 }
 
-static BOOL test_LookupSids_async(struct dcerpc_pipe *p, 
+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[NUM_ASYNC_REQUESTS];
-       struct lsa_TransNameArray names[NUM_ASYNC_REQUESTS];
-       struct lsa_LookupSids r[NUM_ASYNC_REQUESTS];
+       uint32_t *count;
+       struct lsa_TransNameArray *names;
+       struct lsa_LookupSids *r;
        struct rpc_request **req;
-
        int i, replies;
-       BOOL ret = True;
+       bool ret = true;
+       const int num_async_requests = 50;
 
-       printf("\nTesting %d async lookupsids request\n", 100);
+       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);
 
-       req = talloc_array(mem_ctx, struct rpc_request *, 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;
@@ -552,7 +700,7 @@ static BOOL test_LookupSids_async(struct dcerpc_pipe *p,
 
        replies = 0;
 
-       for (i=0; i<NUM_ASYNC_REQUESTS; i++) {
+       for (i=0; i<num_async_requests; i++) {
                count[i] = 0;
                names[i].count = 0;
                names[i].names = NULL;
@@ -567,28 +715,28 @@ static BOOL test_LookupSids_async(struct dcerpc_pipe *p,
                
                req[i] = dcerpc_lsa_LookupSids_send(p, req, &r[i]);
                if (req[i] == NULL) {
-                       ret = False;
+                       ret = false;
                        break;
                }
 
                req[i]->async.callback = lookupsids_cb;
-               req[i]->async.private = &replies;
+               req[i]->async.private_data = &replies;
        }
 
-       while (replies < NUM_ASYNC_REQUESTS) {
+       while (replies >= 0 && replies < num_async_requests) {
                event_loop_once(p->conn->event_ctx);
-               if (replies < 0) {
-                       ret = False;
-                       break;
-               }
        }
 
        talloc_free(req);
 
+       if (replies < 0) {
+               ret = false;
+       }
+
        return ret;
 }
 
-static BOOL test_LookupPrivValue(struct dcerpc_pipe *p, 
+static bool test_LookupPrivValue(struct dcerpc_pipe *p, 
                                 TALLOC_CTX *mem_ctx, 
                                 struct policy_handle *handle,
                                 struct lsa_String *name)
@@ -604,13 +752,13 @@ static BOOL test_LookupPrivValue(struct dcerpc_pipe *p,
        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 false;
        }
 
-       return True;
+       return true;
 }
 
-static BOOL test_LookupPrivName(struct dcerpc_pipe *p, 
+static bool test_LookupPrivName(struct dcerpc_pipe *p, 
                                TALLOC_CTX *mem_ctx, 
                                struct policy_handle *handle,
                                struct lsa_LUID *luid)
@@ -624,13 +772,13 @@ 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;
+       return true;
 }
 
-static BOOL test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p, 
+static bool test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p, 
                                             TALLOC_CTX *mem_ctx,                                 
                                             struct policy_handle *acct_handle,
                                             struct lsa_LUID *luid)
@@ -638,7 +786,7 @@ static BOOL test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
        NTSTATUS status;
        struct lsa_RemovePrivilegesFromAccount r;
        struct lsa_PrivilegeSet privs;
-       BOOL ret = True;
+       bool ret = true;
 
        printf("Testing RemovePrivilegesFromAccount\n");
 
@@ -655,13 +803,13 @@ static BOOL test_RemovePrivilegesFromAccount(struct dcerpc_pipe *p,
        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 false;
        }
 
        return ret;
 }
 
-static BOOL test_AddPrivilegesToAccount(struct dcerpc_pipe *p, 
+static bool test_AddPrivilegesToAccount(struct dcerpc_pipe *p, 
                                        TALLOC_CTX *mem_ctx,                              
                                        struct policy_handle *acct_handle,
                                        struct lsa_LUID *luid)
@@ -669,7 +817,7 @@ static BOOL test_AddPrivilegesToAccount(struct dcerpc_pipe *p,
        NTSTATUS status;
        struct lsa_AddPrivilegesToAccount r;
        struct lsa_PrivilegeSet privs;
-       BOOL ret = True;
+       bool ret = true;
 
        printf("Testing AddPrivilegesToAccount\n");
 
@@ -685,20 +833,20 @@ static BOOL test_AddPrivilegesToAccount(struct dcerpc_pipe *p,
        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 false;
        }
 
        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;
+       bool ret = true;
 
        printf("Testing EnumPrivsAccount\n");
 
@@ -707,7 +855,7 @@ 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 && r.out.privs->count > 0) {
@@ -726,7 +874,7 @@ static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p,
        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)
 {
@@ -737,16 +885,36 @@ static BOOL test_Delete(struct dcerpc_pipe *p,
 
        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;
        }
 
-       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)
 {
@@ -765,19 +933,35 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p,
        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_DeleteTrustedDomain(struct dcerpc_pipe *p, 
+static bool test_DeleteTrustedDomain(struct dcerpc_pipe *p, 
                                     TALLOC_CTX *mem_ctx, 
                                     struct policy_handle *handle,
                                     struct lsa_StringLarge name)
@@ -794,18 +978,42 @@ static BOOL test_DeleteTrustedDomain(struct dcerpc_pipe *p,
        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;
+               return false;
        }
 
        if (!test_Delete(p, mem_ctx, &trustdom_handle)) {
-               return False;
+               return false;
+       }
+
+       if (!test_DeleteObject(p, mem_ctx, &trustdom_handle)) {
+               return false;
        }
 
-       return True;
+       return true;
 }
 
+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.dom_sid = sid;
+
+       status = dcerpc_lsa_DeleteTrustedDomain(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("lsa_DeleteTrustedDomain failed - %s\n", nt_errstr(status));
+               return false;
+       }
+
+       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)
 {
@@ -819,12 +1027,12 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
        struct lsa_SetSecret r7;
        struct lsa_QuerySecret r8;
        struct policy_handle sec_handle, sec_handle2, sec_handle3;
-       struct lsa_Delete d;
+       struct lsa_DeleteObject d_o;
        struct lsa_DATA_BUF buf1;
        struct lsa_DATA_BUF_PTR bufp1;
        struct lsa_DATA_BUF_PTR bufp2;
        DATA_BLOB enc_key;
-       BOOL ret = True;
+       bool ret = true;
        DATA_BLOB session_key;
        NTTIME old_mtime, new_mtime;
        DATA_BLOB blob1, blob2;
@@ -854,7 +1062,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("CreateSecret failed - %s\n", nt_errstr(status));
-                       return False;
+                       return false;
                }
                
                r.in.handle = handle;
@@ -864,7 +1072,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                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;
+                       return false;
                }
                
                r2.in.handle = handle;
@@ -877,13 +1085,13 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("OpenSecret failed - %s\n", nt_errstr(status));
-                       return False;
+                       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;
+                       return false;
                }
                
                enc_key = sess_encrypt_string(secret1, &session_key);
@@ -900,7 +1108,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("SetSecret failed - %s\n", nt_errstr(status));
-                       return False;
+                       return false;
                }
                
                r3.in.sec_handle = &sec_handle;
@@ -918,7 +1126,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                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;
+                       ret = false;
                }
                
                data_blob_free(&enc_key);
@@ -939,23 +1147,24 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r4);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QuerySecret failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       ret = false;
                } else {
                        if (r4.out.new_val == NULL || r4.out.new_val->buf == NULL) {
                                printf("No secret buffer returned\n");
-                               ret = False;
+                               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(&blob1, &session_key);
+                               secret2 = sess_decrypt_string(mem_ctx, 
+                                                             &blob1, &session_key);
                                
                                if (strcmp(secret1, secret2) != 0) {
                                        printf("Returned secret '%s' doesn't match '%s'\n", 
                                               secret2, secret1);
-                                       ret = False;
+                                       ret = false;
                                }
                        }
                }
@@ -974,7 +1183,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_SetSecret(p, mem_ctx, &r5);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("SetSecret failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       ret = false;
                }
                
                data_blob_free(&enc_key);
@@ -995,14 +1204,14 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r6);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QuerySecret failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       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;
+                               ret = false;
                                secret4 = NULL;
                        } else {
                                blob1.data = r6.out.new_val->buf->data;
@@ -1010,11 +1219,12 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                                
                                blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
                                
-                               secret4 = sess_decrypt_string(&blob1, &session_key);
+                               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;
+                                       ret = false;
                                }
 
                                blob1.data = r6.out.old_val->buf->data;
@@ -1022,18 +1232,19 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                                
                                blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
                                
-                               secret2 = sess_decrypt_string(&blob1, &session_key);
+                               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;
+                                       ret = false;
                                }
                                
                                if (*r6.out.new_mtime == *r6.out.old_mtime) {
                                        printf("Returned secret %s had same mtime for both secrets: %s\n", 
                                               secname[i],
                                               nt_time_string(mem_ctx, *r6.out.new_mtime));
-                                       ret = False;
+                                       ret = false;
                                }
                        }
                }
@@ -1052,7 +1263,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_SetSecret(p, mem_ctx, &r7);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("SetSecret failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       ret = false;
                }
                
                data_blob_free(&enc_key);
@@ -1070,77 +1281,58 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r8);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QuerySecret failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       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) {
-                               if (i != LOCAL) { 
-                                       printf("NEW secret buffer not returned after GLOBAL OLD set\n");
-                                       ret = False;
-                               }
+                               ret = false;
+                       } else if (r8.out.new_val->buf != NULL) {
+                               printf("NEW secret buffer must not be returned after OLD set\n");
+                               ret = false;
                        } else if (r8.out.old_val->buf == NULL) {
-                               printf("OLD secret buffer not returned after OLD set\n");
-                               ret = False;
+                               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;
+                               ret = false;
                        } else {
-                               if (i == LOCAL) { 
-                                       printf("NEW secret buffer should not be returned after LOCAL OLD set\n");
-                                       ret = False;
-                               }
-                               blob1.data = r8.out.new_val->buf->data;
-                               blob1.length = r8.out.new_val->buf->length;
-                               
-                               blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
-                               
-                               secret6 = sess_decrypt_string(&blob1, &session_key);
-                               
-                               if (strcmp(secret3, secret4) != 0) {
-                                       printf("Returned NEW secret '%s' doesn't match '%s'\n", secret4, secret3);
-                                       ret = False;
-                               }
-
                                blob1.data = r8.out.old_val->buf->data;
                                blob1.length = r8.out.old_val->buf->size;
                                
                                blob2 = data_blob_talloc(mem_ctx, NULL, blob1.length);
                                
-                               secret6 = sess_decrypt_string(&blob1, &session_key);
+                               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;
+                                       ret = false;
                                }
                                
-                               if (*r8.out.new_mtime == *r8.out.old_mtime) {
-                                       if (i != GLOBAL) { 
-                                               printf("Returned secret %s had same mtime for both secrets: %s\n", 
-                                                      secname[i],
-                                                      nt_time_string(mem_ctx, *r8.out.new_mtime));
-                                               ret = False;
-                                       }
-                               } else {
+                               if (*r8.out.new_mtime != *r8.out.old_mtime) {
                                        printf("Returned secret %s should have 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;
+                                       ret = false;
                                }
                        }
                }
 
                if (!test_Delete(p, mem_ctx, &sec_handle)) {
-                       ret = False;
+                       ret = false;
                }
                
-               d.in.handle = &sec_handle2;
-               status = dcerpc_lsa_Delete(p, mem_ctx, &d);
+               if (!test_DeleteObject(p, mem_ctx, &sec_handle)) {
+                       return 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;
+                       ret = false;
                } else {
 
                        printf("Testing OpenSecret of just-deleted secret\n");
@@ -1148,7 +1340,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                        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;
+                               ret = false;
                        }
                }
                
@@ -1158,7 +1350,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
 }
 
 
-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)
@@ -1175,37 +1367,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_QuerySecurity(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_QuerySecurity r;
 
+       if (torture_setting_bool(tctx, "samba4", false)) {
+               printf("skipping QuerySecurity test against Samba4\n");
+               return true;
+       }
+
        printf("Testing QuerySecurity\n");
 
        r.in.handle = acct_handle;
        r.in.sec_info = 7;
 
-       status = dcerpc_lsa_QuerySecurity(p, mem_ctx, &r);
+       status = dcerpc_lsa_QuerySecurity(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("QuerySecurity failed - %s\n", nt_errstr(status));
-               return False;
+               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)
@@ -1224,21 +1422,21 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
        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_QuerySecurity(p, mem_ctx, handle, &acct_handle)) {
-               return False;
+               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)
 {
@@ -1247,6 +1445,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");
 
@@ -1257,38 +1456,38 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        r.out.sids = &sids1;
 
        resume_handle = 0;
-       while (True) {
+       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;
+                       return false;
                }
 
                if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
-                       return False;
+                       return false;
                }
 
                if (!test_LookupSids2(p, mem_ctx, handle, &sids1)) {
-                       return False;
+                       return false;
                }
 
-               if (!test_LookupSids3(p, mem_ctx, &sids1)) {
-                       return False;
-               }
+               /* Can't test lookupSids3 here, as clearly we must not
+                * be on schannel, or we would not be able to do the
+                * rest */
 
                printf("testing all accounts\n");
                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);
+                       ret &= test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
+                       ret &= test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
                }
                printf("\n");
        }
 
        if (sids1.num_sids < 3) {
-               return True;
+               return ret;
        }
        
        printf("trying EnumAccounts partial listing (asking for 1 at 2)\n");
@@ -1299,18 +1498,18 @@ 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;
+       return true;
 }
 
-static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
+static bool test_LookupPrivDisplayName(struct dcerpc_pipe *p,
                                TALLOC_CTX *mem_ctx,
                                struct policy_handle *handle,
                                struct lsa_String *priv_name)
@@ -1332,16 +1531,16 @@ static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
        status = dcerpc_lsa_LookupPrivDisplayName(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("LookupPrivDisplayName failed - %s\n", nt_errstr(status));
-               return False;
+               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;
+       return true;
 }
 
-static BOOL test_EnumAccountsWithUserRight(struct dcerpc_pipe *p, 
+static bool test_EnumAccountsWithUserRight(struct dcerpc_pipe *p, 
                                TALLOC_CTX *mem_ctx,
                                struct policy_handle *handle,
                                struct lsa_String *priv_name)
@@ -1362,19 +1561,19 @@ static BOOL test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
 
        /* 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 false;
        }
        
-       return True;
+       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)
 {
@@ -1383,7 +1582,7 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
        struct lsa_PrivArray privs1;
        uint32_t resume_handle = 0;
        int i;
-       BOOL ret = True;
+       bool ret = true;
 
        printf("\ntesting EnumPrivs\n");
 
@@ -1397,28 +1596,88 @@ 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;
+                       ret = false;
                }
        }
 
        return ret;
 }
 
-static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p, 
+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 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;
+       bool ret = true;
                
        printf("\nTesting OpenTrustedDomain, OpenTrustedDomainByName and QueryInfoTrustedDomain\n");
        for (i=0; i< domains->count; i++) {
@@ -1427,8 +1686,10 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                struct policy_handle trustdom_handle;
                struct policy_handle handle2;
                struct lsa_Close c;
-               int levels [] = {1, 3, 6, 8, 12};
-                       
+               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;
@@ -1439,12 +1700,15 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                        
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("OpenTrustedDomain failed - %s\n", nt_errstr(status));
-                               return False;
+                               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;
@@ -1452,17 +1716,54 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                                q.in.level = levels[j];
                                q.out.info = &info;
                                status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
-                               if (!NT_STATUS_IS_OK(status)) {
+                               if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                        printf("QueryTrustedDomainInfo level %d failed - %s\n", 
                                               levels[j], nt_errstr(status));
-                                       ret = False;
+                                       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;
+                               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;
+                               }
                        }
                }
 
@@ -1475,7 +1776,7 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                        
                if (!NT_STATUS_IS_OK(status)) {
                        printf("OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
-                       return False;
+                       return false;
                }
 
                for (j=0; j < ARRAY_SIZE(levels); j++) {
@@ -1485,10 +1786,14 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                        q.in.level = levels[j];
                        q.out.info = &info;
                        status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
-                       if (!NT_STATUS_IS_OK(status)) {
+                       if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                printf("QueryTrustedDomainInfo level %d failed - %s\n", 
                                       levels[j], nt_errstr(status));
-                               ret = False;
+                               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;
                        }
                }
                
@@ -1498,29 +1803,9 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                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;
+                       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)) {
-                               printf("QueryTrustedDomainInfoBySid level %d failed - %s\n", 
-                                      levels[j], nt_errstr(status));
-                               ret = False;
-                       }
-               }
-               
                for (j=0; j < ARRAY_SIZE(levels); j++) {
                        struct lsa_QueryTrustedDomainInfoByName q;
                        union lsa_TrustedDomainInfo info;
@@ -1529,28 +1814,52 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                        q.in.level          = levels[j];
                        q.out.info          = &info;
                        status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, mem_ctx, &q);
-                       if (!NT_STATUS_IS_OK(status)) {
+                       if (!NT_STATUS_IS_OK(status) && ok[j]) {
                                printf("QueryTrustedDomainInfoByName level %d failed - %s\n", 
                                       levels[j], nt_errstr(status));
-                               ret = False;
+                               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;
+       struct lsa_EnumTrustedDomainsEx r_ex;
        NTSTATUS enum_status;
        uint32_t resume_handle = 0;
        struct lsa_DomainList domains;
-       BOOL ret = True;
+       struct lsa_DomainListEx domains_ex;
+       bool ret = true;
 
        printf("\nTesting EnumTrustDom\n");
 
+       r.in.handle = handle;
+       r.in.resume_handle = &resume_handle;
+       r.in.max_size = 0;
+       r.out.domains = &domains;
+       r.out.resume_handle = &resume_handle;
+       
+       enum_status = dcerpc_lsa_EnumTrustDom(p, 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;
@@ -1562,7 +1871,7 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
                
                /* NO_MORE_ENTRIES is allowed */
                if (NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES)) {
-                       return True;
+                       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) {
@@ -1570,28 +1879,85 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
                                       "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;
+                               ret = false;
                        }
                } else if (!NT_STATUS_IS_OK(enum_status)) {
                        printf("EnumTrustDom failed - %s\n", nt_errstr(enum_status));
-                       return False;
+                       return false;
                }
                
+               if (domains.count == 0) {
+                       printf("EnumTrustDom failed - should have returned 'NT_STATUS_NO_MORE_ENTRIES' for 0 trusted domains\n");
+                       return false;
+               }
+
                ret &= test_query_each_TrustDom(p, mem_ctx, handle, &domains);
+               
+       } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
+
+       printf("\nTesting EnumTrustedDomainsEx\n");
 
+       r_ex.in.handle = handle;
+       r_ex.in.resume_handle = &resume_handle;
+       r_ex.in.max_size = LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER * 3;
+       r_ex.out.domains = &domains_ex;
+       r_ex.out.resume_handle = &resume_handle;
+       
+       enum_status = dcerpc_lsa_EnumTrustedDomainsEx(p, 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 (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, 
+static bool test_CreateTrustedDomain(struct dcerpc_pipe *p, 
                                     TALLOC_CTX *mem_ctx, 
                                     struct policy_handle *handle)
 {
        NTSTATUS status;
-       BOOL ret = True;
+       bool ret = true;
        struct lsa_CreateTrustedDomain r;
-       struct lsa_TrustInformation trustinfo;
+       struct lsa_DomainInfo trustinfo;
        struct dom_sid *domsid[12];
        struct policy_handle trustdom_handle[12];
        struct lsa_QueryTrustedDomainInfo q;
@@ -1599,6 +1965,10 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
 
        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);
@@ -1620,7 +1990,7 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
                }
                if (!NT_STATUS_IS_OK(status)) {
                        printf("CreateTrustedDomain failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       ret = false;
                } else {
                
                        q.in.trustdom_handle = &trustdom_handle[i];
@@ -1628,14 +1998,14 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
                        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;
+                               ret = false;
                        } else if (!q.out.info) {
-                               ret = False;
+                               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;
+                                       ret = false;
                                }
                        }
                }
@@ -1643,26 +2013,31 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
 
        /* now that we have some domains to look over, we can test the enum calls */
        if (!test_EnumTrustDom(p, mem_ctx, handle)) {
-               ret = False;
+               ret = false;
        }
        
        for (i=0; i<12; i++) {
-               if (!test_Delete(p, mem_ctx, &trustdom_handle[i])) {
-                       ret = False;
+               if (!test_DeleteTrustedDomainBySid(p, mem_ctx, handle, domsid[i])) {
+                       ret = false;
                }
        }
 
        return ret;
 }
 
-static BOOL test_QueryDomainInfoPolicy(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;
+       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++) {
@@ -1671,11 +2046,11 @@ static BOOL test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
 
                printf("\ntrying QueryDomainInformationPolicy level %d\n", i);
 
-               status = dcerpc_lsa_QueryDomainInformationPolicy(p, mem_ctx, &r);
+               status = dcerpc_lsa_QueryDomainInformationPolicy(p, tctx, &r);
 
                if (!NT_STATUS_IS_OK(status)) {
                        printf("QueryDomainInformationPolicy failed - %s\n", nt_errstr(status));
-                       ret = False;
+                       ret = false;
                        continue;
                }
        }
@@ -1684,14 +2059,14 @@ static BOOL test_QueryDomainInfoPolicy(struct dcerpc_pipe *p,
 }
 
 
-static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, 
-                                TALLOC_CTX *mem_ctx, 
+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++) {
@@ -1700,71 +2075,144 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p,
 
                printf("\ntrying QueryInfoPolicy level %d\n", i);
 
-               status = dcerpc_lsa_QueryInfoPolicy(p, mem_ctx, &r);
+               status = dcerpc_lsa_QueryInfoPolicy(p, tctx, &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;
+               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;
-               }
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       printf("QueryInfoPolicy2 failed - %s\n", nt_errstr(status));
-                       ret = False;
-                       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;
                }
        }
 
        return ret;
 }
 
-static BOOL test_GetUserName(struct dcerpc_pipe *p, 
-                                 TALLOC_CTX *mem_ctx, 
-                                 struct policy_handle *handle)
+static bool test_GetUserName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        struct lsa_GetUserName r;
        NTSTATUS status;
-       BOOL ret = True;
+       bool ret = true;
        struct lsa_StringPointer authority_name_p;
 
        printf("\nTesting GetUserName\n");
 
-       r.in.system_name = "\\";        
-       r.in.account_name = NULL;       
+       r.in.system_name = "\\";
+       r.in.account_name = NULL;
        r.in.authority_name = &authority_name_p;
        authority_name_p.string = NULL;
 
@@ -1772,13 +2220,13 @@ static BOOL test_GetUserName(struct dcerpc_pipe *p,
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("GetUserName failed - %s\n", nt_errstr(status));
-               ret = False;
+               ret = false;
        }
 
        return ret;
 }
 
-BOOL test_lsa_Close(struct dcerpc_pipe *p, 
+bool test_lsa_Close(struct dcerpc_pipe *p, 
                    TALLOC_CTX *mem_ctx, 
                    struct policy_handle *handle)
 {
@@ -1794,104 +2242,138 @@ BOOL test_lsa_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(void)
+bool torture_rpc_lsa(struct torture_context *tctx)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
-       TALLOC_CTX *mem_ctx;
-       BOOL ret = True;
+       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(mem_ctx, &p, &dcerpc_table_lsarpc);
+       status = torture_rpc_connection(tctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(mem_ctx);
-               return False;
+               return false;
        }
 
-       if (!test_OpenPolicy(p, mem_ctx)) {
-               ret = False;
+       if (!test_OpenPolicy(p, tctx)) {
+               ret = false;
        }
 
-       if (!test_lsa_OpenPolicy2(p, mem_ctx, &handle)) {
-               ret = False;
+       if (!test_lsa_OpenPolicy2(p, tctx, &handle)) {
+               ret = false;
        }
 
        if (handle) {
-               if (!test_LookupSids_async(p, mem_ctx, handle)) {
-                       ret = False;
+               join = torture_join_domain(tctx, TEST_MACHINENAME, ACB_WSTRUST, &machine_creds);
+               if (!join) {
+                       ret = false;
                }
 
-               if (!test_QueryDomainInfoPolicy(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_LookupNames_wellknown(p, tctx, handle)) {
+                       ret = false;
+               }               
+
+               if (!test_LookupNames_bogus(p, tctx, handle)) {
+                       ret = false;
+               }               
+
+               if (!test_LookupSids_async(p, tctx, handle)) {
+                       ret = false;
                }
-               
-               if (!test_CreateAccount(p, mem_ctx, handle)) {
-                       ret = False;
+
+               if (!test_QueryDomainInfoPolicy(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_CreateSecret(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_CreateAccount(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_CreateTrustedDomain(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_CreateSecret(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_EnumAccounts(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_CreateTrustedDomain(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_EnumPrivs(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_EnumAccounts(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_QueryInfoPolicy(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_EnumPrivs(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_QueryInfoPolicy2(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_QueryInfoPolicy(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_GetUserName(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_QueryInfoPolicy2(p, tctx, handle)) {
+                       ret = false;
                }
                
-#if 0
-               if (!test_Delete(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_Delete(p, tctx, handle)) {
+                       ret = false;
                }
-#endif
                
-               if (!test_many_LookupSids(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_many_LookupSids(p, tctx, handle)) {
+                       ret = false;
                }
                
-               if (!test_lsa_Close(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_lsa_Close(p, tctx, handle)) {
+                       ret = false;
                }
+               
+               torture_leave_domain(tctx, join);
+
        } else {
-               if (!test_many_LookupSids(p, mem_ctx, handle)) {
-                       ret = False;
+               if (!test_many_LookupSids(p, tctx, handle)) {
+                       ret = false;
                }
        }
+
+       if (!test_GetUserName(p, tctx)) {
+               ret = false;
+       }
+
+       return ret;
+}
+
+bool torture_rpc_lsa_get_user(struct torture_context *torture)
+{
+        NTSTATUS status;
+        struct dcerpc_pipe *p;
+       TALLOC_CTX *mem_ctx;
+       bool ret = true;
+
+       mem_ctx = talloc_init("torture_rpc_lsa_get_user");
+
+       status = torture_rpc_connection(torture, &p, &ndr_table_lsarpc);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(mem_ctx);
+               return false;
+       }
+
+       if (!test_GetUserName(p, mem_ctx)) {
+               ret = false;
+       }
                
        talloc_free(mem_ctx);