r24557: rename 'dcerpc_table_' -> 'ndr_table_'
[ira/wip.git] / source / torture / rpc / lsa.c
index 543ea4f48afb1f07380dfc365240e177d0a19ad5..cf50d99d82dccf4dc19e3bce6fd63b6999b00525 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 "librpc/gen_ndr/ndr_lsa.h"
+#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"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
@@ -58,6 +63,11 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        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;
        }
@@ -67,7 +77,7 @@ static BOOL test_OpenPolicy(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 policy_handle **handle)
 {
        struct lsa_ObjectAttribute attr;
        struct lsa_QosInfo qos;
@@ -76,6 +86,11 @@ BOOL test_lsa_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;
@@ -91,10 +106,17 @@ BOOL test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.system_name = "\\";
        r.in.attr = &attr;
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r.out.handle = handle;
+       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;
        }
@@ -233,6 +255,48 @@ static BOOL test_LookupNames3(struct dcerpc_pipe *p,
        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) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               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, 
@@ -319,7 +383,6 @@ static BOOL test_LookupSids2(struct dcerpc_pipe *p,
 
 static BOOL test_LookupSids3(struct dcerpc_pipe *p, 
                            TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *handle,
                            struct lsa_SidArray *sids)
 {
        struct lsa_LookupSids3 r;
@@ -355,19 +418,17 @@ static BOOL test_LookupSids3(struct dcerpc_pipe *p,
 
        printf("\n");
 
-       if (!test_LookupNames3(p, mem_ctx, handle, &names)) {
+       if (!test_LookupNames4(p, mem_ctx, &names)) {
                return False;
        }
 
        return True;
 }
 
-static BOOL test_many_LookupSids(struct dcerpc_pipe *p, 
-                                TALLOC_CTX *mem_ctx, 
-                                struct policy_handle *handle)
+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;
@@ -375,9 +436,6 @@ 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 = 100;
 
        sids.sids = talloc_array(mem_ctx, struct lsa_SidPtr, sids.num_sids);
@@ -389,29 +447,153 @@ 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) &&
+                   !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+                       printf("LookupSids failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+               
+               printf("\n");
+               
+               if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+                       return False;
+               }
+       } else {
+               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) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+                       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 ret;
+}
+
 static BOOL test_LookupPrivValue(struct dcerpc_pipe *p, 
                                 TALLOC_CTX *mem_ctx, 
                                 struct policy_handle *handle,
@@ -604,14 +786,14 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p,
 static BOOL test_DeleteTrustedDomain(struct dcerpc_pipe *p, 
                                     TALLOC_CTX *mem_ctx, 
                                     struct policy_handle *handle,
-                                    struct lsa_String name)
+                                    struct lsa_StringLarge name)
 {
        NTSTATUS status;
        struct lsa_OpenTrustedDomainByName r;
        struct policy_handle trustdom_handle;
 
        r.in.handle = handle;
-       r.in.name = name;
+       r.in.name.string = name.string;
        r.in.access_mask = SEC_STD_DELETE;
        r.out.trustdom_handle = &trustdom_handle;
 
@@ -628,6 +810,26 @@ static BOOL test_DeleteTrustedDomain(struct dcerpc_pipe *p,
        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, 
                              TALLOC_CTX *mem_ctx, 
@@ -701,13 +903,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));
-                       ret = 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));
-                       ret = False;
+                       return False;
                }
                
                enc_key = sess_encrypt_string(secret1, &session_key);
@@ -724,7 +926,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));
-                       ret = False;
+                       return False;
                }
                
                r3.in.sec_handle = &sec_handle;
@@ -774,7 +976,8 @@ 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 secret '%s' doesn't match '%s'\n", 
@@ -820,19 +1023,22 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                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(&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);
@@ -844,7 +1050,8 @@ 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);
@@ -918,7 +1125,8 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                                
                                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(secret3, secret4) != 0) {
                                        printf("Returned NEW secret '%s' doesn't match '%s'\n", secret4, secret3);
@@ -930,7 +1138,8 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
                                
                                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);
@@ -997,7 +1206,8 @@ 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));
+               printf("EnumAccountRights of %s failed - %s\n", 
+                      dom_sid_string(mem_ctx, sid), nt_errstr(status));
                return False;
        }
 
@@ -1013,6 +1223,11 @@ static BOOL test_QuerySecurity(struct dcerpc_pipe *p,
        NTSTATUS status;
        struct lsa_QuerySecurity r;
 
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping QuerySecurity test against Samba4\n");
+               return True;
+       }
+
        printf("Testing QuerySecurity\n");
 
        r.in.handle = acct_handle;
@@ -1069,6 +1284,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");
 
@@ -1097,20 +1313,20 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
                        return False;
                }
 
-               if (!test_LookupSids3(p, mem_ctx, handle, &sids1)) {
+               if (!test_LookupSids3(p, mem_ctx, &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);
+                       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");
@@ -1223,9 +1439,9 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
        }
 
        for (i = 0; i< privs1.count; i++) {
-               test_LookupPrivDisplayName(p, mem_ctx, handle, &privs1.privs[i].name);
-               test_LookupPrivValue(p, mem_ctx, handle, &privs1.privs[i].name);
-               if (!test_EnumAccountsWithUserRight(p, mem_ctx, handle, &privs1.privs[i].name)) {
+               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;
                }
        }
@@ -1233,6 +1449,68 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
        return ret;
 }
 
+static BOOL test_QueryForestTrustInformation(struct dcerpc_pipe *p, 
+                                            TALLOC_CTX *mem_ctx, 
+                                            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;
+       uint16_t unknown = 0;
+
+       printf("\nTesting lsaRQueryForestTrustInformation\n");
+
+       if (lp_parm_bool(-1, "torture", "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, mem_ctx, &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) 
+{
+       NTSTATUS status;
+       int i,j;
+       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, 
@@ -1249,8 +1527,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};
+               int ok[]      = {1, 0, 1, 0, 0, 1, 0, 1, 0,  0,  0,  1};
+
                if (domains->domains[i].sid) {
                        trust.in.handle = handle;
                        trust.in.sid = domains->domains[i].sid;
@@ -1267,6 +1547,9 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                        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;
@@ -1274,22 +1557,59 @@ 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;
+                               } 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 = domains->domains[i].name;
+               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;
                        
@@ -1307,10 +1627,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;
+                       } else if (NT_STATUS_IS_OK(status) && !ok[j]) {
+                               printf("QueryTrustedDomainInfo level %d unexpectedly succeeded - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = False;
                        }
                }
                
@@ -1323,38 +1647,22 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p,
                        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;
                        q.in.handle         = handle;
-                       q.in.trusted_domain = domains->domains[i].name;
+                       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)) {
+                       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;
                        }
                }
        }
@@ -1366,9 +1674,11 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
                              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;
+       struct lsa_DomainListEx domains_ex;
        BOOL ret = True;
 
        printf("\nTesting EnumTrustDom\n");
@@ -1400,7 +1710,43 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
                }
                
                ret &= test_query_each_TrustDom(p, mem_ctx, handle, &domains);
+               
+       } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
+
+       printf("\nTesting EnumTrustedDomainsEx\n");
+
+       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);
+                               ret = False;
+                               exit(1);
+                       }
+               } else if (!NT_STATUS_IS_OK(enum_status)) {
+                       printf("EnumTrustedDomainEx failed - %s\n", nt_errstr(enum_status));
+                       return False;
+               }
 
+               ret &= test_query_each_TrustDomEx(p, mem_ctx, handle, &domains_ex);
+               
        } while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
 
        return ret;
@@ -1413,7 +1759,7 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
        NTSTATUS status;
        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;
@@ -1428,7 +1774,7 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
                domsid[i] = dom_sid_parse_talloc(mem_ctx, trust_sid);
 
                trustinfo.sid = domsid[i];
-               init_lsa_String(&trustinfo.name, trust_name);
+               init_lsa_String((struct lsa_String *)&trustinfo.name, trust_name);
 
                r.in.handle = handle;
                r.in.info = &trustinfo;
@@ -1469,7 +1815,7 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
        }
        
        for (i=0; i<12; i++) {
-               if (!test_Delete(p, mem_ctx, &trustdom_handle[i])) {
+               if (!test_DeleteTrustedDomainBySid(p, mem_ctx, handle, domsid[i])) {
                        ret = False;
                }
        }
@@ -1477,6 +1823,40 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
        return ret;
 }
 
+static BOOL test_QueryDomainInfoPolicy(struct dcerpc_pipe *p, 
+                                TALLOC_CTX *mem_ctx, 
+                                struct policy_handle *handle)
+{
+       struct lsa_QueryDomainInformationPolicy r;
+       NTSTATUS status;
+       int i;
+       BOOL ret = True;
+       if (lp_parm_bool(-1, "torture", "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, mem_ctx, &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, 
                                 TALLOC_CTX *mem_ctx, 
                                 struct policy_handle *handle)
@@ -1487,6 +1867,11 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p,
        BOOL ret = True;
        printf("\nTesting QueryInfoPolicy\n");
 
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping QueryInfoPolicy against Samba4\n");
+               return True;
+       }
+
        for (i=1;i<13;i++) {
                r.in.handle = handle;
                r.in.level = i;
@@ -1520,6 +1905,10 @@ static BOOL test_QueryInfoPolicy2(struct dcerpc_pipe *p,
        int i;
        BOOL ret = True;
        printf("\nTesting QueryInfoPolicy2\n");
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping QueryInfoPolicy2 against Samba4\n");
+               return True;
+       }
 
        for (i=1;i<13;i++) {
                r.in.handle = handle;
@@ -1545,9 +1934,7 @@ static BOOL test_QueryInfoPolicy2(struct dcerpc_pipe *p,
        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;
@@ -1556,8 +1943,8 @@ static BOOL test_GetUserName(struct dcerpc_pipe *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;
 
@@ -1602,21 +1989,17 @@ BOOL test_lsa_Close(struct dcerpc_pipe *p,
        return True;
 }
 
-BOOL torture_rpc_lsa(void)
+BOOL torture_rpc_lsa(struct torture_context *torture)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
-       struct policy_handle handle;
+       struct policy_handle *handle;
 
        mem_ctx = talloc_init("torture_rpc_lsa");
 
-       status = torture_rpc_connection(mem_ctx, 
-                                       &p, 
-                                       DCERPC_LSARPC_NAME, 
-                                       DCERPC_LSARPC_UUID, 
-                                       DCERPC_LSARPC_VERSION);
+       status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
                return False;
@@ -1630,86 +2013,90 @@ BOOL torture_rpc_lsa(void)
                ret = False;
        }
 
-       if (!test_many_LookupSids(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_CreateAccount(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_CreateSecret(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_CreateTrustedDomain(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_EnumAccounts(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_EnumPrivs(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_QueryInfoPolicy(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_QueryInfoPolicy2(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
-       if (!test_GetUserName(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       if (handle) {
+               if (!test_LookupSids_async(p, mem_ctx, handle)) {
+                       ret = False;
+               }
 
+               if (!test_QueryDomainInfoPolicy(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_CreateAccount(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_CreateSecret(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_CreateTrustedDomain(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_EnumAccounts(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_EnumPrivs(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_QueryInfoPolicy(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_QueryInfoPolicy2(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
 #if 0
-       if (!test_Delete(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+               if (!test_Delete(p, mem_ctx, handle)) {
+                       ret = False;
+               }
 #endif
-       
-       if (!test_lsa_Close(p, mem_ctx, &handle)) {
-               ret = False;
+               
+               if (!test_many_LookupSids(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+               
+               if (!test_lsa_Close(p, mem_ctx, handle)) {
+                       ret = False;
+               }
+       } else {
+               if (!test_many_LookupSids(p, mem_ctx, handle)) {
+                       ret = False;
+               }
        }
 
+       if (!test_GetUserName(p, mem_ctx)) {
+               ret = False;
+       }
+               
        talloc_free(mem_ctx);
 
        return ret;
 }
 
-
-BOOL torture_rpc_lsa_secrets(void) 
+BOOL torture_rpc_lsa_get_user(struct torture_context *torture)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
-       struct policy_handle handle;
 
-       mem_ctx = talloc_init("torture_rpc_lsa_secrets");
+       mem_ctx = talloc_init("torture_rpc_lsa_get_user");
 
-       status = torture_rpc_connection(mem_ctx, 
-                                       &p, 
-                                       DCERPC_LSARPC_NAME, 
-                                       DCERPC_LSARPC_UUID, 
-                                       DCERPC_LSARPC_VERSION);
+       status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
                return False;
        }
 
-       if (!test_lsa_OpenPolicy2(p, mem_ctx, &handle)) {
+       if (!test_GetUserName(p, mem_ctx)) {
                ret = False;
        }
-
-       if (!test_CreateSecret(p, mem_ctx, &handle)) {
-               ret = False;
-       }
-
+               
        talloc_free(mem_ctx);
 
        return ret;