r4585: don't consider LookupSids3 failing with NT_STATUS_ACCESS_DENIED (as w2k3 does) or
[samba.git] / source4 / torture / rpc / lsa.c
index df095aca6e589f8716e21f032e7ee003718c5d0b..84f56fed71970fddb87d2afc0452e70c6fd8454d 100644 (file)
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_lsa.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_String(struct lsa_String *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->string = s;
 }
 
 static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
@@ -86,14 +34,16 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct lsa_QosInfo qos;
        struct lsa_OpenPolicy r;
        NTSTATUS status;
-       uint16 system_name = '\\';
+       uint16_t system_name = '\\';
 
        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;
@@ -102,7 +52,7 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        r.in.system_name = &system_name;
        r.in.attr = &attr;
-       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = &handle;
 
        status = dcerpc_lsa_OpenPolicy(p, mem_ctx, &r);
@@ -125,10 +75,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;
@@ -137,7 +89,7 @@ static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r.in.system_name = "\\";
        r.in.attr = &attr;
-       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = handle;
 
        status = dcerpc_lsa_OpenPolicy2(p, mem_ctx, &r);
@@ -149,122 +101,743 @@ static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        return True;
 }
 
-static BOOL test_LookupNames(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *handle,
-                           struct lsa_TransNameArray *tnames)
+static BOOL test_LookupNames(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct policy_handle *handle,
+                           struct lsa_TransNameArray *tnames)
+{
+       struct lsa_LookupNames r;
+       struct lsa_TransSidArray sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       printf("\nTesting LookupNames with %d names\n", tnames->count);
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array_p(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_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               printf("LookupNames failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       printf("\n");
+
+       return True;
+}
+
+static BOOL test_LookupNames2(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle,
+                             struct lsa_TransNameArray2 *tnames)
+{
+       struct lsa_LookupNames2 r;
+       struct lsa_TransSidArray2 sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       printf("\nTesting LookupNames2 with %d names\n", tnames->count);
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array_p(mem_ctx, struct lsa_String, tnames->count);
+       for (i=0;i<tnames->count;i++) {
+               init_lsa_String(&names[i], tnames->names[i].name.string);
+       }
+
+       r.in.handle = handle;
+       r.in.num_names = tnames->count;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_LookupNames2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               printf("LookupNames2 failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       printf("\n");
+
+       return True;
+}
+
+
+static BOOL test_LookupNames3(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx, 
+                             struct policy_handle *handle,
+                             struct lsa_TransNameArray2 *tnames)
+{
+       struct lsa_LookupNames3 r;
+       struct lsa_TransSidArray3 sids;
+       struct lsa_String *names;
+       uint32_t count = 0;
+       NTSTATUS status;
+       int i;
+
+       printf("\nTesting LookupNames3 with %d names\n", tnames->count);
+
+       sids.count = 0;
+       sids.sids = NULL;
+
+       names = talloc_array_p(mem_ctx, struct lsa_String, tnames->count);
+       for (i=0;i<tnames->count;i++) {
+               init_lsa_String(&names[i], tnames->names[i].name.string);
+       }
+
+       r.in.handle = handle;
+       r.in.num_names = tnames->count;
+       r.in.names = names;
+       r.in.sids = &sids;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_LookupNames3(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               printf("LookupNames3 failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       printf("\n");
+
+       return True;
+}
+
+
+static BOOL test_LookupSids(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct policy_handle *handle,
+                           struct lsa_SidArray *sids)
+{
+       struct lsa_LookupSids r;
+       struct lsa_TransNameArray names;
+       uint32_t count = sids->num_sids;
+       NTSTATUS status;
+
+       printf("\nTesting LookupSids\n");
+
+       names.count = 0;
+       names.names = NULL;
+
+       r.in.handle = handle;
+       r.in.sids = sids;
+       r.in.names = &names;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.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;
+       }
+
+       return True;
+}
+
+
+static BOOL test_LookupSids2(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct policy_handle *handle,
+                           struct lsa_SidArray *sids)
+{
+       struct lsa_LookupSids2 r;
+       struct lsa_TransNameArray2 names;
+       uint32_t count = sids->num_sids;
+       NTSTATUS status;
+
+       printf("\nTesting LookupSids2\n");
+
+       names.count = 0;
+       names.names = NULL;
+
+       r.in.handle = handle;
+       r.in.sids = sids;
+       r.in.names = &names;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.names = &names;
+
+       status = dcerpc_lsa_LookupSids2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               printf("LookupSids2 failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       printf("\n");
+
+       if (!test_LookupNames2(p, mem_ctx, handle, &names)) {
+               return False;
+       }
+
+       if (!test_LookupNames3(p, mem_ctx, handle, &names)) {
+               return False;
+       }
+
+       return True;
+}
+
+static BOOL test_LookupSids3(struct dcerpc_pipe *p, 
+                           TALLOC_CTX *mem_ctx, 
+                           struct policy_handle *handle,
+                           struct lsa_SidArray *sids)
+{
+       struct lsa_LookupSids3 r;
+       struct lsa_TransNameArray2 names;
+       uint32_t count = sids->num_sids;
+       NTSTATUS status;
+
+       printf("\nTesting LookupSids3\n");
+
+       names.count = 0;
+       names.names = NULL;
+
+       r.in.sids = sids;
+       r.in.names = &names;
+       r.in.level = 1;
+       r.in.count = &count;
+       r.in.unknown1 = 0;
+       r.in.unknown2 = 0;
+       r.out.count = &count;
+       r.out.names = &names;
+
+       status = dcerpc_lsa_LookupSids3(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) && !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 - not considered an error\n", 
+                      nt_errstr(status));
+               return False;
+       }
+
+       printf("\n");
+
+       if (!test_LookupNames3(p, mem_ctx, handle, &names)) {
+               return False;
+       }
+
+       return True;
+}
+
+static 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;
+       int i;
+
+       printf("\nTesting LookupSids with lots of SIDs\n");
+
+       names.count = 0;
+       names.names = NULL;
+
+       sids.num_sids = 100;
+
+       sids.sids = talloc_array_p(mem_ctx, struct lsa_SidPtr, sids.num_sids);
+
+       for (i=0; i<sids.num_sids; i++) {
+               const char *sidstr = "S-1-5-32-545";
+               sids.sids[i].sid = dom_sid_parse_talloc(mem_ctx, sidstr);
+       }
+
+       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;
+
+       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;
+       }
+
+       return True;
+}
+
+static BOOL test_LookupPrivValue(struct dcerpc_pipe *p, 
+                                TALLOC_CTX *mem_ctx, 
+                                struct policy_handle *handle,
+                                struct lsa_String *name)
+{
+       NTSTATUS status;
+       struct lsa_LookupPrivValue r;
+       struct lsa_LUID luid;
+
+       r.in.handle = handle;
+       r.in.name = name;
+       r.out.luid = &luid;
+
+       status = dcerpc_lsa_LookupPrivValue(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("\nLookupPrivValue failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       return True;
+}
+
+static BOOL test_LookupPrivName(struct dcerpc_pipe *p, 
+                               TALLOC_CTX *mem_ctx, 
+                               struct policy_handle *handle,
+                               struct lsa_LUID *luid)
+{
+       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_RemovePrivilegesFromAccount(struct dcerpc_pipe *p, 
+                                            TALLOC_CTX *mem_ctx,                                 
+                                            struct policy_handle *acct_handle,
+                                            struct lsa_LUID *luid)
+{
+       NTSTATUS status;
+       struct lsa_RemovePrivilegesFromAccount r;
+       struct lsa_PrivilegeSet privs;
+       BOOL ret = True;
+
+       printf("Testing RemovePrivilegesFromAccount\n");
+
+       r.in.handle = acct_handle;
+       r.in.remove_all = 0;
+       r.in.privs = &privs;
+
+       privs.count = 1;
+       privs.unknown = 0;
+       privs.set = talloc_array_p(mem_ctx, struct lsa_LUIDAttribute, 1);
+       privs.set[0].luid = *luid;
+       privs.set[0].attribute = 0;
+
+       status = dcerpc_lsa_RemovePrivilegesFromAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("RemovePrivilegesFromAccount failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       return ret;
+}
+
+static BOOL test_AddPrivilegesToAccount(struct dcerpc_pipe *p, 
+                                       TALLOC_CTX *mem_ctx,                              
+                                       struct policy_handle *acct_handle,
+                                       struct lsa_LUID *luid)
+{
+       NTSTATUS status;
+       struct lsa_AddPrivilegesToAccount r;
+       struct lsa_PrivilegeSet privs;
+       BOOL ret = True;
+
+       printf("Testing AddPrivilegesToAccount\n");
+
+       r.in.handle = acct_handle;
+       r.in.privs = &privs;
+
+       privs.count = 1;
+       privs.unknown = 0;
+       privs.set = talloc_array_p(mem_ctx, struct lsa_LUIDAttribute, 1);
+       privs.set[0].luid = *luid;
+       privs.set[0].attribute = 0;
+
+       status = dcerpc_lsa_AddPrivilegesToAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("AddPrivilegesToAccount failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       return ret;
+}
+
+static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p, 
+                                 TALLOC_CTX *mem_ctx,                            
+                                 struct policy_handle *handle,
+                                 struct policy_handle *acct_handle)
+{
+       NTSTATUS status;
+       struct lsa_EnumPrivsAccount r;
+       BOOL ret = True;
+
+       printf("Testing EnumPrivsAccount\n");
+
+       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 && r.out.privs->count > 0) {
+               int i;
+               for (i=0;i<r.out.privs->count;i++) {
+                       test_LookupPrivName(p, mem_ctx, handle, 
+                                           &r.out.privs->set[i].luid);
+               }
+
+               ret &= test_RemovePrivilegesFromAccount(p, mem_ctx, acct_handle, 
+                                                       &r.out.privs->set[0].luid);
+               ret &= test_AddPrivilegesToAccount(p, mem_ctx, acct_handle, 
+                                                  &r.out.privs->set[0].luid);
+       }
+
+       return ret;
+}
+
+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");
+
+       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.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.out.acct_handle = &acct_handle;
+
+       status = dcerpc_lsa_CreateAccount(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               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_DeleteTrustedDomain(struct dcerpc_pipe *p, 
+                                    TALLOC_CTX *mem_ctx, 
+                                    struct policy_handle *handle,
+                                    struct lsa_String name)
+{
+       NTSTATUS status;
+       struct lsa_OpenTrustedDomainByName r;
+       struct policy_handle trustdom_handle;
+
+       r.in.handle = handle;
+       r.in.name = name;
+       r.in.access_mask = SEC_STD_DELETE;
+       r.out.trustdom_handle = &trustdom_handle;
+
+       status = dcerpc_lsa_OpenTrustedDomainByName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("lsa_OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!test_Delete(p, mem_ctx, &trustdom_handle)) {
+               return False;
+       }
+
+       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-21-97398-379795-12345");
+
+       trustinfo.sid = domsid;
+       init_lsa_String(&trustinfo.name, "torturedomain");
+
+       r.in.handle = handle;
+       r.in.info = &trustinfo;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.out.dom_handle = &dom_handle;
+
+       status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
+               test_DeleteTrustedDomain(p, mem_ctx, handle, trustinfo.name);
+               status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("CreateTrustedDomain failed - %s\n", nt_errstr(status));
+               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)
 {
-       struct lsa_LookupNames r;
-       struct lsa_TransSidArray sids;
-       struct lsa_Name *names;
-       uint32 count = 0;
        NTSTATUS status;
-       int i;
+       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;
+       DATA_BLOB session_key;
+       NTTIME old_mtime, new_mtime;
+       DATA_BLOB blob1, blob2;
+       const char *secret1 = "abcdef12345699qwerty";
+       char *secret2;
+       char *secname;
 
-       printf("\nTesting LookupNames\n");
+       printf("Testing CreateSecret\n");
 
-       sids.count = 0;
-       sids.sids = NULL;
+       asprintf(&secname, "torturesecret-%u", (uint_t)random());
 
-       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_String(&r.in.name, secname);
 
        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;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.out.sec_handle = &sec_handle;
 
-       status = dcerpc_lsa_LookupNames(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
-               printf("LookupNames failed - %s\n", nt_errstr(status));
+       status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("CreateSecret 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));
+       r2.in.handle = handle;
+       r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       r2.in.name = r.in.name;
+       r2.out.sec_handle = &sec_handle2;
+
+       printf("Testing OpenSecret\n");
+
+       status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("OpenSecret failed - %s\n", nt_errstr(status));
+               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;
+       }
+
+       if (r4.out.new_val->buf == NULL) {
+               printf("No secret buffer returned\n");
+               ret = False;
+       } else {
+               blob1.data = r4.out.new_val->buf->data;
+               blob1.length = r4.out.new_val->buf->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;
                }
        }
 
-       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);
+       if (!test_Delete(p, mem_ctx, &sec_handle)) {
+               ret = False;
        }
 
-       printf("\n");
+       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 True;
+       return ret;
 }
 
 
-static BOOL test_LookupSids(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *handle,
-                           struct lsa_SidArray *sids)
+static BOOL test_EnumAccountRights(struct dcerpc_pipe *p, 
+                                  TALLOC_CTX *mem_ctx, 
+                                  struct policy_handle *acct_handle,
+                                  struct dom_sid *sid)
 {
-       struct lsa_LookupSids r;
-       struct lsa_TransNameArray names;
-       uint32 count = sids->num_sids;
        NTSTATUS status;
-       int i;
-
-       printf("\nTesting LookupSids\n");
+       struct lsa_EnumAccountRights r;
+       struct lsa_RightSet rights;
 
-       names.count = 0;
-       names.names = NULL;
+       printf("Testing EnumAccountRights\n");
 
-       r.in.handle = handle;
-       r.in.sids = sids;
-       r.in.names = &names;
-       r.in.level = 1;
-       r.in.count = &count;
-       r.out.count = &count;
-       r.out.names = &names;
+       r.in.handle = acct_handle;
+       r.in.sid = sid;
+       r.out.rights = &rights;
 
-       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));
+       status = dcerpc_lsa_EnumAccountRights(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumAccountRights 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));
-               }
-       }
+       return True;
+}
 
-       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);
-       }
 
-       printf("\n");
+static BOOL test_QuerySecurity(struct dcerpc_pipe *p, 
+                            TALLOC_CTX *mem_ctx, 
+                            struct policy_handle *handle,
+                            struct policy_handle *acct_handle)
+{
+       NTSTATUS status;
+       struct lsa_QuerySecurity r;
 
-       if (!test_LookupNames(p, mem_ctx, handle, &names)) {
+       printf("Testing QuerySecurity\n");
+
+       r.in.handle = acct_handle;
+       r.in.sec_info = 7;
+
+       status = dcerpc_lsa_QuerySecurity(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("QuerySecurity failed - %s\n", nt_errstr(status));
                return False;
        }
 
@@ -280,11 +853,11 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
        struct lsa_OpenAccount r;
        struct policy_handle acct_handle;
 
-       printf("Testing account %s\n", lsa_sid_string_talloc(mem_ctx, sid));
+       printf("Testing OpenAccount\n");
 
        r.in.handle = handle;
        r.in.sid = sid;
-       r.in.desired_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
        status = dcerpc_lsa_OpenAccount(p, mem_ctx, &r);
@@ -293,6 +866,14 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
                return False;
        }
 
+       if (!test_EnumPrivsAccount(p, mem_ctx, handle, &acct_handle)) {
+               return False;
+       }
+
+       if (!test_QuerySecurity(p, mem_ctx, handle, &acct_handle)) {
+               return False;
+       }
+
        return True;
 }
 
@@ -303,7 +884,7 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        NTSTATUS status;
        struct lsa_EnumAccounts r;
        struct lsa_SidArray sids1, sids2;
-       uint32 resume_handle = 0;
+       uint32_t resume_handle = 0;
        int i;
 
        printf("\ntesting EnumAccounts\n");
@@ -315,28 +896,36 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        r.out.sids = &sids1;
 
        resume_handle = 0;
-       status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("EnumAccounts failed - %s\n", nt_errstr(status));
-               return False;
-       }
+       while (True) {
+               status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+                       break;
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("EnumAccounts failed - %s\n", nt_errstr(status));
+                       return False;
+               }
 
-       printf("Got %d sids resume_handle=%u\n", sids1.num_sids, resume_handle);
+               if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
+                       return False;
+               }
 
-       for (i=0;i<sids1.num_sids;i++) {
-               printf("%s\n", lsa_sid_string_talloc(mem_ctx, sids1.sids[i].sid));
-       }
+               if (!test_LookupSids2(p, mem_ctx, handle, &sids1)) {
+                       return False;
+               }
 
-       if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
-               return False;
-       }
+               if (!test_LookupSids3(p, mem_ctx, handle, &sids1)) {
+                       return False;
+               }
 
-       printf("testing all accounts\n");
-       for (i=0;i<sids1.num_sids;i++) {
-               test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
+               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);
+               }
+               printf("\n");
        }
-       printf("\n");
-       
+
        if (sids1.num_sids < 3) {
                return True;
        }
@@ -360,6 +949,69 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        return True;
 }
 
+static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
+                               TALLOC_CTX *mem_ctx,
+                               struct policy_handle *handle,
+                               struct lsa_String *priv_name)
+{
+       struct lsa_LookupPrivDisplayName r;
+       NTSTATUS status;
+       /* produce a reasonable range of language output without screwing up
+          terminals */
+       uint16 language_id = (random() % 4) + 0x409;
+
+       printf("testing LookupPrivDisplayName(%s)\n", priv_name->string);
+       
+       r.in.handle = handle;
+       r.in.name = priv_name;
+       r.in.language_id = &language_id;
+       r.out.language_id = &language_id;
+       r.in.unknown = 0;
+
+       status = dcerpc_lsa_LookupPrivDisplayName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("LookupPrivDisplayName failed - %s\n", nt_errstr(status));
+               return False;
+       }
+       printf("%s -> \"%s\"  (language 0x%x/0x%x)\n", 
+              priv_name->string, r.out.disp_name->string, 
+              *r.in.language_id, *r.out.language_id);
+
+       return True;
+}
+
+static BOOL test_EnumAccountsWithUserRight(struct dcerpc_pipe *p, 
+                               TALLOC_CTX *mem_ctx,
+                               struct policy_handle *handle,
+                               struct lsa_String *priv_name)
+{
+       struct lsa_EnumAccountsWithUserRight r;
+       struct lsa_SidArray sids;
+       NTSTATUS status;
+
+       ZERO_STRUCT(sids);
+       
+       printf("testing EnumAccountsWithUserRight(%s)\n", priv_name->string);
+       
+       r.in.handle = handle;
+       r.in.name = priv_name;
+       r.out.sids = &sids;
+
+       status = dcerpc_lsa_EnumAccountsWithUserRight(p, mem_ctx, &r);
+
+       /* NT_STATUS_NO_MORE_ENTRIES means noone has this privilege */
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+               return True;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumAccountsWithUserRight failed - %s\n", nt_errstr(status));
+               return False;
+       }
+       
+       return True;
+}
+
 
 static BOOL test_EnumPrivs(struct dcerpc_pipe *p, 
                           TALLOC_CTX *mem_ctx, 
@@ -368,14 +1020,15 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
        NTSTATUS status;
        struct lsa_EnumPrivs r;
        struct lsa_PrivArray privs1;
-       uint32 resume_handle = 0;
+       uint32_t resume_handle = 0;
        int i;
+       BOOL ret = True;
 
        printf("\ntesting EnumPrivs\n");
 
        r.in.handle = handle;
        r.in.resume_handle = &resume_handle;
-       r.in.max_count = 1000;
+       r.in.max_count = 100;
        r.out.resume_handle = &resume_handle;
        r.out.privs = &privs1;
 
@@ -386,16 +1039,15 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
                return False;
        }
 
-       printf("Got %d privs resume_handle=%u\n", privs1.count, resume_handle);
-
-       for (i=0;i<privs1.count;i++) {
-               printf("luid=%08x-%08x '%s'\n", 
-                      privs1.privs[i].luid_low,
-                      privs1.privs[i].luid_high,
-                      privs1.privs[i].name.name);
+       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)) {
+                       ret = False;
+               }
        }
 
-       return True;
+       return ret;
 }
 
 
@@ -405,55 +1057,240 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
 {
        struct lsa_EnumTrustDom r;
        NTSTATUS status;
-       int i;
-       uint32 resume_handle = 0;
-       struct lsa_RefDomainList domains;
+       uint32_t resume_handle = 0;
+       struct lsa_DomainList domains;
+       int i,j;
+       BOOL ret = True;
 
        printf("\nTesting EnumTrustDom\n");
 
        r.in.handle = handle;
        r.in.resume_handle = &resume_handle;
-       r.in.num_entries = 1000;
+       r.in.num_entries = 100;
        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;
        }
 
-       printf("lookup gave %d domains (max_count=%d)\n", 
-              domains.count,
-              domains.max_count);
-       for (i=0;i<r.out.domains->count;i++) {
-               printf("name='%s' sid=%s\n", 
-                      domains.domains[i].name.name,
-                      lsa_sid_string_talloc(mem_ctx, domains.domains[i].sid));
+       printf("\nTesting OpenTrustedDomain, OpenTrustedDomainByName and QueryInfoTrustedDomain\n");
+
+       for (i=0; i< domains.count; i++) {
+               struct lsa_OpenTrustedDomain trust;
+               struct lsa_OpenTrustedDomainByName trust_by_name;
+               struct policy_handle trustdom_handle;
+               struct policy_handle handle2;
+               struct lsa_Close c;
+               int levels [] = {1, 3, 6, 8, 12};
+               
+               trust.in.handle = handle;
+               trust.in.sid = domains.domains[i].sid;
+               trust.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               trust.out.trustdom_handle = &trustdom_handle;
+
+               status = dcerpc_lsa_OpenTrustedDomain(p, mem_ctx, &trust);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("OpenTrustedDomain failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+
+               c.in.handle = &trustdom_handle;
+               c.out.handle = &handle2;
+               
+               for (j=0; j < ARRAY_SIZE(levels); j++) {
+                       struct lsa_QueryTrustedDomainInfo q;
+                       union lsa_TrustedDomainInfo info;
+                       q.in.trustdom_handle = &trustdom_handle;
+                       q.in.level = levels[j];
+                       q.out.info = &info;
+                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("QueryTrustedDomainInfo level %d failed - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = False;
+                       }
+               }
+               
+               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;
+               }
+
+               trust_by_name.in.handle = handle;
+               trust_by_name.in.name = domains.domains[i].name;
+               trust_by_name.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               trust_by_name.out.trustdom_handle = &trustdom_handle;
+               
+               status = dcerpc_lsa_OpenTrustedDomainByName(p, mem_ctx, &trust_by_name);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("OpenTrustedDomainByName failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+
+               for (j=0; j < ARRAY_SIZE(levels); j++) {
+                       struct lsa_QueryTrustedDomainInfo q;
+                       union lsa_TrustedDomainInfo info;
+                       q.in.trustdom_handle = &trustdom_handle;
+                       q.in.level = levels[j];
+                       q.out.info = &info;
+                       status = dcerpc_lsa_QueryTrustedDomainInfo(p, mem_ctx, &q);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("QueryTrustedDomainInfo level %d failed - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = False;
+                       }
+               }
+               
+               c.in.handle = &trustdom_handle;
+               c.out.handle = &handle2;
+
+               status = dcerpc_lsa_Close(p, mem_ctx, &c);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("Close of trusted domain failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+
+               for (j=0; j < ARRAY_SIZE(levels); j++) {
+                       struct lsa_QueryTrustedDomainInfoBySid q;
+                       union lsa_TrustedDomainInfo info;
+                       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.level          = levels[j];
+                       q.out.info          = &info;
+                       status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, mem_ctx, &q);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("QueryTrustedDomainInfoByName level %d failed - %s\n", 
+                                      levels[j], nt_errstr(status));
+                               ret = False;
+                       }
+               }
+               
+               
+
        }
 
-       return True;
+       return ret;
 }
 
-static BOOL test_Delete(struct dcerpc_pipe *p, 
-                      TALLOC_CTX *mem_ctx, 
-                      struct policy_handle *handle)
+static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, 
+                                TALLOC_CTX *mem_ctx, 
+                                struct policy_handle *handle)
 {
+       struct lsa_QueryInfoPolicy r;
        NTSTATUS status;
-       struct lsa_Delete r;
+       int i;
+       BOOL ret = True;
+       printf("\nTesting QueryInfoPolicy\n");
 
-       printf("\ntesting Delete - but what does it do?\n");
+       for (i=1;i<13;i++) {
+               r.in.handle = handle;
+               r.in.level = i;
 
-       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("\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;
+               }
        }
 
-       printf("\n");
+       return ret;
+}
 
-       return True;
+static BOOL test_QueryInfoPolicy2(struct dcerpc_pipe *p, 
+                                 TALLOC_CTX *mem_ctx, 
+                                 struct policy_handle *handle)
+{
+       struct lsa_QueryInfoPolicy2 r;
+       NTSTATUS status;
+       int i;
+       BOOL ret = True;
+       printf("\nTesting QueryInfoPolicy2\n");
+
+       for (i=1;i<13;i++) {
+               r.in.handle = handle;
+               r.in.level = i;
+
+               printf("\ntrying QueryInfoPolicy2 level %d\n", i);
+
+               status = dcerpc_lsa_QueryInfoPolicy2(p, 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;
+               }
+       }
+
+       return ret;
+}
+
+static BOOL test_GetUserName(struct dcerpc_pipe *p, 
+                                 TALLOC_CTX *mem_ctx, 
+                                 struct policy_handle *handle)
+{
+       struct lsa_GetUserName r;
+       NTSTATUS status;
+       BOOL ret = True;
+       struct lsa_StringPointer authority_name_p;
+
+       printf("\nTesting GetUserName\n");
+
+       r.in.system_name = "\\";        
+       r.in.account_name = NULL;       
+       r.in.authority_name = &authority_name_p;
+       authority_name_p.string = NULL;
+
+       status = dcerpc_lsa_GetUserName(p, mem_ctx, &r);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("GetUserName failed - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       return ret;
 }
 
 static BOOL test_Close(struct dcerpc_pipe *p, 
@@ -477,7 +1314,7 @@ static BOOL test_Close(struct dcerpc_pipe *p,
 
        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_INVALID_LEVEL)) {
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                printf("Close failed - %s\n", nt_errstr(status));
                return False;
        }
@@ -487,7 +1324,7 @@ static BOOL test_Close(struct dcerpc_pipe *p,
        return True;
 }
 
-BOOL torture_rpc_lsa(int dummy)
+BOOL torture_rpc_lsa(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
@@ -497,11 +1334,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;
        }
@@ -510,6 +1350,22 @@ BOOL torture_rpc_lsa(int dummy)
                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;
        }
@@ -521,7 +1377,19 @@ BOOL torture_rpc_lsa(int dummy)
        if (!test_EnumTrustDom(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 0
        if (!test_Delete(p, mem_ctx, &handle)) {
                ret = False;
@@ -532,6 +1400,8 @@ BOOL torture_rpc_lsa(int dummy)
                ret = False;
        }
 
+       talloc_destroy(mem_ctx);
+
         torture_rpc_close(p);
 
        return ret;