r4671: Expand the RPC-LSA test to set secret values twice.
[samba.git] / source / torture / rpc / lsa.c
index 5eaabce3cda76789bbecc563b507fcf2ffc68b65..79e82a25daaad5750600cb17c8c7b6c9ebadc62e 100644 (file)
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 
-static void init_lsa_Name(struct lsa_Name *name, const char *s)
+static void init_lsa_String(struct lsa_String *name, const char *s)
 {
-       name->name = s;
+       name->string = s;
 }
 
 static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
@@ -51,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.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = &handle;
 
        status = dcerpc_lsa_OpenPolicy(p, mem_ctx, &r);
@@ -64,8 +65,8 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
-static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                            struct policy_handle *handle)
+BOOL test_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                         struct policy_handle *handle)
 {
        struct lsa_ObjectAttribute attr;
        struct lsa_QosInfo qos;
@@ -88,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.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = handle;
 
        status = dcerpc_lsa_OpenPolicy2(p, mem_ctx, &r);
@@ -107,7 +108,7 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
 {
        struct lsa_LookupNames r;
        struct lsa_TransSidArray sids;
-       struct lsa_Name *names;
+       struct lsa_String *names;
        uint32_t count = 0;
        NTSTATUS status;
        int i;
@@ -117,9 +118,9 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
        sids.count = 0;
        sids.sids = NULL;
 
-       names = talloc(mem_ctx, tnames->count * sizeof(names[0]));
+       names = talloc_array_p(mem_ctx, struct lsa_String, tnames->count);
        for (i=0;i<tnames->count;i++) {
-               init_lsa_Name(&names[i], tnames->names[i].name.name);
+               init_lsa_String(&names[i], tnames->names[i].name.string);
        }
 
        r.in.handle = handle;
@@ -142,6 +143,95 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
        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, 
@@ -181,6 +271,96 @@ static BOOL test_LookupSids(struct dcerpc_pipe *p,
        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)
@@ -197,7 +377,7 @@ static BOOL test_many_LookupSids(struct dcerpc_pipe *p,
        names.count = 0;
        names.names = NULL;
 
-       sids.num_sids = 1000;
+       sids.num_sids = 100;
 
        sids.sids = talloc_array_p(mem_ctx, struct lsa_SidPtr, sids.num_sids);
 
@@ -231,6 +411,28 @@ static BOOL test_many_LookupSids(struct dcerpc_pipe *p,
        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,
@@ -251,6 +453,67 @@ static BOOL test_LookupPrivName(struct dcerpc_pipe *p,
        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,
@@ -258,6 +521,7 @@ static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p,
 {
        NTSTATUS status;
        struct lsa_EnumPrivsAccount r;
+       BOOL ret = True;
 
        printf("Testing EnumPrivsAccount\n");
 
@@ -269,15 +533,20 @@ static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p,
                return False;
        }
 
-       if (r.out.privs) {
+       if (r.out.privs && r.out.privs->count > 0) {
                int i;
                for (i=0;i<r.out.privs->count;i++) {
                        test_LookupPrivName(p, mem_ctx, handle, 
                                            &r.out.privs->set[i].luid);
                }
+
+               ret &= test_RemovePrivilegesFromAccount(p, mem_ctx, acct_handle, 
+                                                       &r.out.privs->set[0].luid);
+               ret &= test_AddPrivilegesToAccount(p, mem_ctx, acct_handle, 
+                                                  &r.out.privs->set[0].luid);
        }
 
-       return True;
+       return ret;
 }
 
 static BOOL test_Delete(struct dcerpc_pipe *p, 
@@ -317,7 +586,7 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p,
 
        r.in.handle = handle;
        r.in.sid = newsid;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
        status = dcerpc_lsa_CreateAccount(p, mem_ctx, &r);
@@ -333,6 +602,33 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p,
        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, 
@@ -349,14 +645,18 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
        domsid = dom_sid_parse_talloc(mem_ctx, "S-1-5-21-97398-379795-12345");
 
        trustinfo.sid = domsid;
-       init_lsa_Name(&trustinfo.name, "torturedomain");
+       init_lsa_String(&trustinfo.name, "torturedomain");
 
        r.in.handle = handle;
        r.in.info = &trustinfo;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       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;
@@ -378,6 +678,8 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
        struct lsa_OpenSecret r2;
        struct lsa_SetSecret r3;
        struct lsa_QuerySecret r4;
+       struct lsa_SetSecret r5;
+       struct lsa_QuerySecret r6;
        struct policy_handle sec_handle, sec_handle2;
        struct lsa_Delete d;
        struct lsa_DATA_BUF buf1;
@@ -389,113 +691,186 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
        DATA_BLOB blob1, blob2;
        const char *secret1 = "abcdef12345699qwerty";
        char *secret2;
-       char *secname;
-
-       printf("Testing CreateSecret\n");
-
-       asprintf(&secname, "torturesecret-%u", (uint_t)random());
-
-       init_lsa_Name(&r.in.name, secname);
-
-       r.in.handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r.out.sec_handle = &sec_handle;
-
-       status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateSecret failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r2.in.handle = handle;
-       r2.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r2.in.name = r.in.name;
-       r2.out.sec_handle = &sec_handle2;
-
-       printf("Testing OpenSecret\n");
-
-       status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenSecret failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       status = dcerpc_fetch_session_key(p, &session_key);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("dcerpc_fetch_session_key failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       enc_key = sess_encrypt_string(secret1, &session_key);
-
-       r3.in.handle = &sec_handle;
-       r3.in.new_val = &buf1;
-       r3.in.old_val = NULL;
-       r3.in.new_val->data = enc_key.data;
-       r3.in.new_val->length = enc_key.length;
-       r3.in.new_val->size = enc_key.length;
-
-       printf("Testing SetSecret\n");
-
-       status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("SetSecret failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       data_blob_free(&enc_key);
-
-       ZERO_STRUCT(new_mtime);
-       ZERO_STRUCT(old_mtime);
-
-       /* fetch the secret back again */
-       r4.in.handle = &sec_handle;
-       r4.in.new_val = &bufp1;
-       r4.in.new_mtime = &new_mtime;
-       r4.in.old_val = NULL;
-       r4.in.old_mtime = NULL;
-
-       bufp1.buf = NULL;
-
-       status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r4);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("QuerySecret failed - %s\n", nt_errstr(status));
-               ret = False;
-       }
-
-       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);
+       const char *secret3 = "ABCDEF12345699QWERTY";
+       char *secret4;
+       char *secname[2];
+       int i;
 
-               secret2 = sess_decrypt_string(&blob1, &session_key);
 
-               printf("returned secret '%s'\n", secret2);
+       secname[0] = talloc_asprintf(mem_ctx, "torturesecret-%u", (uint_t)random());
+       secname[1] = talloc_asprintf(mem_ctx, "G$torturesecret-%u", (uint_t)random());
 
-               if (strcmp(secret1, secret2) != 0) {
-                       printf("Returned secret doesn't match\n");
+       for (i=0; i< 2; i++) {
+               printf("Testing CreateSecret of %s\n", secname[i]);
+               
+               init_lsa_String(&r.in.name, secname[i]);
+               
+               r.in.handle = handle;
+               r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               r.out.sec_handle = &sec_handle;
+               
+               status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("CreateSecret failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+               
+               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;
+                       }
+               }
+               
+               enc_key = sess_encrypt_string(secret3, &session_key);
+               
+               r5.in.handle = &sec_handle;
+               r5.in.new_val = &buf1;
+               r5.in.old_val = NULL;
+               r5.in.new_val->data = enc_key.data;
+               r5.in.new_val->length = enc_key.length;
+               r5.in.new_val->size = enc_key.length;
+               
+               printf("Testing SetSecret\n");
+               
+               status = dcerpc_lsa_SetSecret(p, mem_ctx, &r5);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("SetSecret failed - %s\n", nt_errstr(status));
+                       ret = False;
+               }
+               
+               data_blob_free(&enc_key);
+               
+               ZERO_STRUCT(new_mtime);
+               ZERO_STRUCT(old_mtime);
+               
+               /* fetch the secret back again */
+               r6.in.handle = &sec_handle;
+               r6.in.new_val = &bufp1;
+               r6.in.new_mtime = &new_mtime;
+               r6.in.old_val = NULL;
+               r6.in.old_mtime = NULL;
+               
+               bufp1.buf = NULL;
+               
+               status = dcerpc_lsa_QuerySecret(p, mem_ctx, &r6);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QuerySecret failed - %s\n", nt_errstr(status));
+                       ret = False;
+               }
+               
+               if (r6.out.new_val->buf == NULL) {
+                       printf("No secret buffer returned\n");
+                       ret = False;
+               } else {
+                       blob1.data = r6.out.new_val->buf->data;
+                       blob1.length = r6.out.new_val->buf->length;
+                       
+                       blob2 = data_blob(NULL, blob1.length);
+                       
+                       secret4 = sess_decrypt_string(&blob1, &session_key);
+                       
+                       printf("returned secret '%s'\n", secret3);
+                       
+                       if (strcmp(secret3, secret4) != 0) {
+                               printf("Returned secret %s doesn't match %s\n", secret4, secret3);
+                               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;
                }
-       }
-
-       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;
+               printf("Testing OpenSecret of just-deleted secret\n");
+               
+               status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                       printf("OpenSecret expected OBJECT_NAME_NOT_FOUND - %s\n", nt_errstr(status));
+                       ret = False;
+               }
+               
        }
 
        return ret;
 }
 
+
 static BOOL test_EnumAccountRights(struct dcerpc_pipe *p, 
                                   TALLOC_CTX *mem_ctx, 
                                   struct policy_handle *acct_handle,
@@ -521,22 +896,22 @@ static BOOL test_EnumAccountRights(struct dcerpc_pipe *p,
 }
 
 
-static BOOL test_QuerySecObj(struct dcerpc_pipe *p, 
+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_QuerySecObj r;
+       struct lsa_QuerySecurity r;
 
-       printf("Testing QuerySecObj\n");
+       printf("Testing QuerySecurity\n");
 
        r.in.handle = acct_handle;
        r.in.sec_info = 7;
 
-       status = dcerpc_lsa_QuerySecObj(p, mem_ctx, &r);
+       status = dcerpc_lsa_QuerySecurity(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("QuerySecObj failed - %s\n", nt_errstr(status));
+               printf("QuerySecurity failed - %s\n", nt_errstr(status));
                return False;
        }
 
@@ -556,7 +931,7 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
 
        r.in.handle = handle;
        r.in.sid = sid;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.acct_handle = &acct_handle;
 
        status = dcerpc_lsa_OpenAccount(p, mem_ctx, &r);
@@ -569,7 +944,7 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
                return False;
        }
 
-       if (!test_QuerySecObj(p, mem_ctx, handle, &acct_handle)) {
+       if (!test_QuerySecurity(p, mem_ctx, handle, &acct_handle)) {
                return False;
        }
 
@@ -595,22 +970,35 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
        r.out.sids = &sids1;
 
        resume_handle = 0;
-       status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("EnumAccounts failed - %s\n", nt_errstr(status));
-               return False;
-       }
+       while (True) {
+               status = dcerpc_lsa_EnumAccounts(p, mem_ctx, &r);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+                       break;
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("EnumAccounts failed - %s\n", nt_errstr(status));
+                       return False;
+               }
 
-       if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
-               return False;
-       }
+               if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
+                       return False;
+               }
+
+               if (!test_LookupSids2(p, mem_ctx, handle, &sids1)) {
+                       return False;
+               }
 
-       printf("testing all accounts\n");
-       for (i=0;i<sids1.num_sids;i++) {
-               test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
-               test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
+               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);
+                       test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
+               }
+               printf("\n");
        }
-       printf("\n");
 
        if (sids1.num_sids < 3) {
                return True;
@@ -638,27 +1026,30 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
 static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
                                TALLOC_CTX *mem_ctx,
                                struct policy_handle *handle,
-                               struct lsa_Name *priv_name)
+                               struct lsa_String *priv_name)
 {
        struct lsa_LookupPrivDisplayName r;
-       struct lsa_Name disp_name;
        NTSTATUS status;
+       /* produce a reasonable range of language output without screwing up
+          terminals */
+       uint16 language_id = (random() % 4) + 0x409;
 
-       ZERO_STRUCT(disp_name);
-       
-       printf("testing LookupPrivDisplayName(%s)\n", priv_name->name);
+       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;
-       r.in.unknown2 = 0;
-       r.out.disp_name = &disp_name;
 
        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;
 }
@@ -666,7 +1057,7 @@ static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
 static BOOL test_EnumAccountsWithUserRight(struct dcerpc_pipe *p, 
                                TALLOC_CTX *mem_ctx,
                                struct policy_handle *handle,
-                               struct lsa_Name *priv_name)
+                               struct lsa_String *priv_name)
 {
        struct lsa_EnumAccountsWithUserRight r;
        struct lsa_SidArray sids;
@@ -674,7 +1065,7 @@ static BOOL test_EnumAccountsWithUserRight(struct dcerpc_pipe *p,
 
        ZERO_STRUCT(sids);
        
-       printf("testing EnumAccountsWithUserRight(%s)\n", priv_name->name);
+       printf("testing EnumAccountsWithUserRight(%s)\n", priv_name->string);
        
        r.in.handle = handle;
        r.in.name = priv_name;
@@ -711,7 +1102,7 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
 
        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;
 
@@ -724,6 +1115,7 @@ 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)) {
                        ret = False;
                }
@@ -741,12 +1133,14 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
        NTSTATUS status;
        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;
 
@@ -762,7 +1156,121 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
                return False;
        }
 
-       return True;
+       printf("\nTesting OpenTrustedDomain, OpenTrustedDomainByName and QueryInfoTrustedDomain\n");
+
+       for (i=0; i< domains.count; i++) {
+               struct lsa_OpenTrustedDomain trust;
+               struct lsa_OpenTrustedDomainByName trust_by_name;
+               struct policy_handle trustdom_handle;
+               struct policy_handle handle2;
+               struct lsa_Close c;
+               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 ret;
 }
 
 static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, 
@@ -833,9 +1341,35 @@ static BOOL test_QueryInfoPolicy2(struct dcerpc_pipe *p,
        return ret;
 }
 
-static BOOL test_Close(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 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;
+}
+
+BOOL test_lsa_Close(struct dcerpc_pipe *p, 
+                   TALLOC_CTX *mem_ctx, 
+                   struct policy_handle *handle)
 {
        NTSTATUS status;
        struct lsa_Close r;
@@ -864,7 +1398,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;
@@ -886,7 +1420,7 @@ BOOL torture_rpc_lsa(int dummy)
                ret = False;
        }
 
-       if (!test_OpenPolicy2(p, mem_ctx, &handle)) {
+       if (!test_lsa_OpenPolicy2(p, mem_ctx, &handle)) {
                ret = False;
        }
 
@@ -925,14 +1459,18 @@ BOOL torture_rpc_lsa(int dummy)
        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;
        }
 #endif
        
-       if (!test_Close(p, mem_ctx, &handle)) {
+       if (!test_lsa_Close(p, mem_ctx, &handle)) {
                ret = False;
        }