r101: added lsa_SetSecret() and lsa_QuerySecret()
[samba.git] / source4 / torture / rpc / lsa.c
index a22e2d6e32d7e070fe864f23d3862b09ca15d131..0b5f825ac2265c25311a503bddd2b9d28194ee3c 100644 (file)
 
 #include "includes.h"
 
-/*
-  these really shouldn't be here ....
-*/
-static char *lsa_sid_string_talloc(TALLOC_CTX *mem_ctx, struct dom_sid *sid)
+static void init_lsa_Name(struct lsa_Name *name, const char *s)
 {
-       int i, ofs, maxlen;
-       uint32 ia;
-       char *ret;
-       
-       if (!sid) {
-               return talloc_asprintf(mem_ctx, "(NULL SID)");
-       }
-
-       maxlen = sid->num_auths * 11 + 25;
-       ret = talloc(mem_ctx, maxlen);
-       if (!ret) return NULL;
-
-       ia = (sid->id_auth[5]) +
-               (sid->id_auth[4] << 8 ) +
-               (sid->id_auth[3] << 16) +
-               (sid->id_auth[2] << 24);
-
-       ofs = snprintf(ret, maxlen, "S-%u-%lu", 
-                      (unsigned int)sid->sid_rev_num, (unsigned long)ia);
-
-       for (i = 0; i < sid->num_auths; i++) {
-               ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]);
-       }
-
-       return ret;
-}
-
-static int dom_sid_compare(struct dom_sid *sid1, struct dom_sid *sid2)
-{
-       int i;
-
-       if (sid1 == sid2) return 0;
-       if (!sid1) return -1;
-       if (!sid2) return 1;
-
-       /* Compare most likely different rids, first: i.e start at end */
-       if (sid1->num_auths != sid2->num_auths)
-               return sid1->num_auths - sid2->num_auths;
-
-       for (i = sid1->num_auths-1; i >= 0; --i)
-               if (sid1->sub_auths[i] != sid2->sub_auths[i])
-                       return sid1->sub_auths[i] - sid2->sub_auths[i];
-
-       if (sid1->sid_rev_num != sid2->sid_rev_num)
-               return sid1->sid_rev_num - sid2->sid_rev_num;
-
-       for (i = 0; i < 6; i++)
-               if (sid1->id_auth[i] != sid2->id_auth[i])
-                       return sid1->id_auth[i] - sid2->id_auth[i];
-
-       return 0;
+       name->name = s;
 }
 
 static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
@@ -90,10 +37,12 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        printf("\ntesting OpenPolicy\n");
 
+       qos.len = 0;
        qos.impersonation_level = 2;
        qos.context_mode = 1;
        qos.effective_only = 0;
 
+       attr.len = 0;
        attr.root_dir = NULL;
        attr.object_name = NULL;
        attr.attributes = 0;
@@ -125,10 +74,12 @@ static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        printf("\ntesting OpenPolicy2\n");
 
+       qos.len = 0;
        qos.impersonation_level = 2;
        qos.context_mode = 1;
        qos.effective_only = 0;
 
+       attr.len = 0;
        attr.root_dir = NULL;
        attr.object_name = NULL;
        attr.attributes = 0;
@@ -168,9 +119,7 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
 
        names = talloc(mem_ctx, tnames->count * sizeof(names[0]));
        for (i=0;i<tnames->count;i++) {
-               names[i].name_len = 2*strlen(tnames->names[i].name.name);
-               names[i].name_size = 2*strlen(tnames->names[i].name.name);
-               names[i].name = tnames->names[i].name.name;
+               init_lsa_Name(&names[i], tnames->names[i].name.name);
        }
 
        r.in.handle = handle;
@@ -183,30 +132,11 @@ 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)) {
+       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
                printf("LookupNames failed - %s\n", nt_errstr(status));
                return False;
        }
 
-       if (r.out.domains) {
-               printf("lookup gave %d domains (max_count=%d)\n", 
-                      r.out.domains->count,
-                      r.out.domains->max_count);
-               for (i=0;i<r.out.domains->count;i++) {
-                       printf("name='%s' sid=%s\n", 
-                              r.out.domains->domains[i].name.name,
-                              lsa_sid_string_talloc(mem_ctx, r.out.domains->domains[i].sid));
-               }
-       }
-
-       printf("lookup gave %d sids (sids.count=%d)\n", count, sids.count);
-       for (i=0;i<sids.count;i++) {
-               printf("sid_type=%d rid=%d sid_index=%d\n", 
-                      sids.sids[i].sid_type,
-                      sids.sids[i].rid,
-                      sids.sids[i].sid_index);
-       }
-
        printf("\n");
 
        return True;
@@ -222,7 +152,6 @@ static BOOL test_LookupSids(struct dcerpc_pipe *p,
        struct lsa_TransNameArray names;
        uint32 count = sids->num_sids;
        NTSTATUS status;
-       int i;
 
        printf("\nTesting LookupSids\n");
 
@@ -238,33 +167,354 @@ 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)) {
+       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
                printf("LookupSids failed - %s\n", nt_errstr(status));
                return False;
        }
 
-       if (r.out.domains) {
-               printf("lookup gave %d domains (max_count=%d)\n", 
-                      r.out.domains->count,
-                      r.out.domains->max_count);
-               for (i=0;i<r.out.domains->count;i++) {
-                       printf("name='%s' sid=%s\n", 
-                              r.out.domains->domains[i].name.name,
-                              lsa_sid_string_talloc(mem_ctx, r.out.domains->domains[i].sid));
+       printf("\n");
+
+       if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+               return False;
+       }
+
+       return True;
+}
+
+static BOOL test_LookupPrivName(struct dcerpc_pipe *p, 
+                               TALLOC_CTX *mem_ctx, 
+                               struct policy_handle *handle,
+                               struct lsa_LUID *luid)
+{
+       NTSTATUS status;
+       struct lsa_LookupPrivName r;
+
+       r.in.handle = handle;
+       r.in.luid = luid;
+
+       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 True;
+}
+
+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;
+
+       printf("Testing EnumPrivsAccount\n");
+
+       r.in.handle = acct_handle;
+
+       status = dcerpc_lsa_EnumPrivsAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumPrivsAccount failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (r.out.privs) {
+               int i;
+               for (i=0;i<r.out.privs->count;i++) {
+                       test_LookupPrivName(p, mem_ctx, handle, 
+                                           &r.out.privs->set[i].luid);
                }
        }
 
-       printf("lookup gave %d names (names.count=%d)\n", count, names.count);
-       for (i=0;i<names.count;i++) {
-               printf("type=%d sid_index=%d name='%s'\n", 
-                      names.names[i].sid_type,
-                      names.names[i].sid_index,
-                      names.names[i].name.name);
+       return True;
+}
+
+static BOOL test_Delete(struct dcerpc_pipe *p, 
+                      TALLOC_CTX *mem_ctx, 
+                      struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_Delete r;
+
+       printf("\ntesting Delete\n");
+
+       r.in.handle = handle;
+       status = dcerpc_lsa_Delete(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Delete failed - %s\n", nt_errstr(status));
+               return False;
        }
 
        printf("\n");
 
-       if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+       return True;
+}
+
+
+static BOOL test_CreateAccount(struct dcerpc_pipe *p, 
+                              TALLOC_CTX *mem_ctx, 
+                              struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_CreateAccount r;
+       struct dom_sid2 *newsid;
+       struct policy_handle acct_handle;
+
+       newsid = dom_sid_parse_talloc(mem_ctx, "S-1-5-12349876-4321-2854");
+
+       printf("Testing CreateAccount\n");
+
+       r.in.handle = handle;
+       r.in.sid = newsid;
+       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.out.acct_handle = &acct_handle;
+
+       status = dcerpc_lsa_CreateAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("CreateAccount failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!test_Delete(p, mem_ctx, &acct_handle)) {
+               return False;
+       }
+
+       return True;
+}
+
+
+static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p, 
+                                    TALLOC_CTX *mem_ctx, 
+                                    struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_CreateTrustedDomain r;
+       struct lsa_TrustInformation trustinfo;
+       struct dom_sid *domsid;
+       struct policy_handle dom_handle;
+
+       printf("Testing CreateTrustedDomain\n");
+
+       domsid = dom_sid_parse_talloc(mem_ctx, "S-1-5-697-97398-3797956");
+
+       trustinfo.sid = domsid;
+       init_lsa_Name(&trustinfo.name, "torturedomain");
+
+       r.in.handle = handle;
+       r.in.info = &trustinfo;
+       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.out.dom_handle = &dom_handle;
+
+       status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("CreateTrustedDomain failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!test_Delete(p, mem_ctx, &dom_handle)) {
+               return False;
+       }
+
+       return True;
+}
+
+static BOOL test_CreateSecret(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_CreateSecret r;
+       struct lsa_OpenSecret r2;
+       struct lsa_SetSecret r3;
+       struct lsa_QuerySecret r4;
+       struct policy_handle sec_handle, sec_handle2;
+       struct lsa_Delete d;
+       struct lsa_DATA_BUF buf1;
+       struct lsa_DATA_BUF_PTR bufp1;
+       DATA_BLOB enc_key;
+       BOOL ret = True;
+       uint8 session_key[16];
+       NTTIME old_mtime, new_mtime;
+       DATA_BLOB blob1, blob2;
+       const char *secret1 = "abcdef12345699qwerty";
+       char *secret2;
+       char *secname;
+
+       printf("Testing CreateSecret\n");
+
+       asprintf(&secname, "torturesecret-%u", (unsigned)random());
+
+       init_lsa_Name(&r.in.name, secname);
+
+       r.in.handle = handle;
+       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.out.sec_handle = &sec_handle;
+
+       status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("CreateSecret failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       r2.in.handle = handle;
+       r2.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r2.in.name = r.in.name;
+       r2.out.sec_handle = &sec_handle2;
+
+       printf("Testing OpenSecret\n");
+
+       status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("OpenSecret failed - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       status = dcerpc_fetch_session_key(p, session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("dcerpc_fetch_session_key failed - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       enc_key = sess_encrypt_string(secret1, session_key);
+
+       r3.in.handle = &sec_handle;
+       r3.in.new_val = &buf1;
+       r3.in.old_val = NULL;
+       r3.in.new_val->data = enc_key.data;
+       r3.in.new_val->length = enc_key.length;
+       r3.in.new_val->size = enc_key.length;
+
+       printf("Testing SetSecret\n");
+
+       status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("SetSecret failed - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       data_blob_free(&enc_key);
+
+       ZERO_STRUCT(new_mtime);
+       ZERO_STRUCT(old_mtime);
+
+       /* fetch the secret back again */
+       r4.in.handle = &sec_handle;
+       r4.in.new_val = &bufp1;
+       r4.in.new_mtime = &new_mtime;
+       r4.in.old_val = NULL;
+       r4.in.old_mtime = NULL;
+
+       bufp1.buf = NULL;
+
+       status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r4);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("QuerySecret failed - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       blob1.data = r4.out.new_val->buf->data;
+       blob1.length = r4.out.new_val->buf->length;
+
+       blob2 = data_blob(NULL, blob1.length);
+
+       secret2 = sess_decrypt_string(&blob1, session_key);
+
+       printf("returned secret '%s'\n", secret2);
+
+       if (strcmp(secret1, secret2) != 0) {
+               printf("Returned secret doesn't match\n");
+               ret = False;
+       }
+
+       if (!test_Delete(p, mem_ctx, &sec_handle)) {
+               ret = False;
+       }
+
+       d.in.handle = &sec_handle2;
+       status = dcerpc_lsa_Delete(p, mem_ctx, &d);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("Second delete expected INVALID_HANDLE - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       return ret;
+}
+
+static BOOL test_EnumAccountRights(struct dcerpc_pipe *p, 
+                                  TALLOC_CTX *mem_ctx, 
+                                  struct policy_handle *acct_handle,
+                                  struct dom_sid *sid)
+{
+       NTSTATUS status;
+       struct lsa_EnumAccountRights r;
+       struct lsa_RightSet rights;
+
+       printf("Testing EnumAccountRights\n");
+
+       r.in.handle = acct_handle;
+       r.in.sid = sid;
+       r.out.rights = &rights;
+
+       status = dcerpc_lsa_EnumAccountRights(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumAccountRights failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       return True;
+}
+
+
+static BOOL test_QuerySecObj(struct dcerpc_pipe *p, 
+                            TALLOC_CTX *mem_ctx, 
+                            struct policy_handle *handle,
+                            struct policy_handle *acct_handle)
+{
+       NTSTATUS status;
+       struct lsa_QuerySecObj r;
+
+       printf("Testing QuerySecObj\n");
+
+       r.in.handle = acct_handle;
+       r.in.sec_info = 7;
+
+       status = dcerpc_lsa_QuerySecObj(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("QuerySecObj failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       return True;
+}
+
+static BOOL test_OpenAccount(struct dcerpc_pipe *p, 
+                            TALLOC_CTX *mem_ctx, 
+                            struct policy_handle *handle,
+                            struct dom_sid *sid)
+{
+       NTSTATUS status;
+       struct lsa_OpenAccount r;
+       struct policy_handle acct_handle;
+
+       printf("Testing OpenAccount\n");
+
+       r.in.handle = handle;
+       r.in.sid = sid;
+       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.out.acct_handle = &acct_handle;
+
+       status = dcerpc_lsa_OpenAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("OpenAccount failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!test_EnumPrivsAccount(p, mem_ctx, handle, &acct_handle)) {
+               return False;
+       }
+
+       if (!test_QuerySecObj(p, mem_ctx, handle, &acct_handle)) {
                return False;
        }
 
@@ -296,16 +546,17 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
                return False;
        }
 
-       printf("Got %d sids resume_handle=%u\n", sids1.num_sids, resume_handle);
+       if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
+               return False;
+       }
 
+       printf("testing all accounts\n");
        for (i=0;i<sids1.num_sids;i++) {
-               printf("%s\n", lsa_sid_string_talloc(mem_ctx, sids1.sids[i].sid));
+               test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
+               test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
        }
+       printf("\n");
 
-       if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
-               return False;
-       }
-       
        if (sids1.num_sids < 3) {
                return True;
        }
@@ -330,22 +581,126 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
 }
 
 
+static BOOL test_EnumPrivs(struct dcerpc_pipe *p, 
+                          TALLOC_CTX *mem_ctx, 
+                          struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct lsa_EnumPrivs r;
+       struct lsa_PrivArray privs1;
+       uint32 resume_handle = 0;
+
+       printf("\ntesting EnumPrivs\n");
+
+       r.in.handle = handle;
+       r.in.resume_handle = &resume_handle;
+       r.in.max_count = 1000;
+       r.out.resume_handle = &resume_handle;
+       r.out.privs = &privs1;
+
+       resume_handle = 0;
+       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 True;
+}
+
+
+static BOOL test_EnumTrustDom(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle)
+{
+       struct lsa_EnumTrustDom r;
+       NTSTATUS status;
+       uint32 resume_handle = 0;
+       struct lsa_DomainList domains;
+
+       printf("\nTesting EnumTrustDom\n");
+
+       r.in.handle = handle;
+       r.in.resume_handle = &resume_handle;
+       r.in.num_entries = 1000;
+       r.out.domains = &domains;
+       r.out.resume_handle = &resume_handle;
+
+       status = dcerpc_lsa_EnumTrustDom(p, mem_ctx, &r);
+
+       /* NO_MORE_ENTRIES is allowed */
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+               return True;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumTrustDom failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       return True;
+}
+
+static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, 
+                                TALLOC_CTX *mem_ctx, 
+                                struct policy_handle *handle)
+{
+       struct lsa_QueryInfoPolicy r;
+       NTSTATUS status;
+       int i;
+       BOOL ret = True;
+       printf("\nTesting QueryInfoPolicy\n");
+
+       for (i=1;i<13;i++) {
+               r.in.handle = handle;
+               r.in.level = i;
+
+               printf("\ntrying QueryInfoPolicy level %d\n", i);
+
+               status = dcerpc_lsa_QueryInfoPolicy(p, mem_ctx, &r);
+
+               if ((i == 9 || i == 10 || i == 11) &&
+                   NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+                       printf("server failed level %u (OK)\n", i);
+                       continue;
+               }
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+                       ret = False;
+                       continue;
+               }
+       }
+
+       return ret;
+}
+
 static BOOL test_Close(struct dcerpc_pipe *p, 
                       TALLOC_CTX *mem_ctx, 
                       struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_Close r;
+       struct policy_handle handle2;
 
        printf("\ntesting Close\n");
 
        r.in.handle = handle;
+       r.out.handle = &handle2;
+
        status = dcerpc_lsa_Close(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Close failed - %s\n", nt_errstr(status));
                return False;
        }
 
+       status = dcerpc_lsa_Close(p, mem_ctx, &r);
+       /* 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;
+       }
+
        printf("\n");
 
        return True;
@@ -361,11 +716,14 @@ BOOL torture_rpc_lsa(int dummy)
 
        mem_ctx = talloc_init("torture_rpc_lsa");
 
-       status = torture_rpc_connection(&p, "lsarpc");
+       status = torture_rpc_connection(&p, 
+                                       DCERPC_LSARPC_NAME, 
+                                       DCERPC_LSARPC_UUID, 
+                                       DCERPC_LSARPC_VERSION);
        if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
-       
+
        if (!test_OpenPolicy(p, mem_ctx)) {
                ret = False;
        }
@@ -374,14 +732,46 @@ BOOL torture_rpc_lsa(int dummy)
                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_EnumTrustDom(p, mem_ctx, &handle)) {
+               ret = False;
+       }
+
+       if (!test_QueryInfoPolicy(p, mem_ctx, &handle)) {
+               ret = False;
+       }
        
-       if (!test_Close(p, mem_ctx, &handle)) {
+#if 0
+       if (!test_Delete(p, mem_ctx, &handle)) {
                ret = False;
        }
+#endif
        
+       if (!test_Close(p, mem_ctx, &handle)) {
+               ret = False;
+       }
+
+       talloc_destroy(mem_ctx);
+
         torture_rpc_close(p);
 
        return ret;