r11964: rename flag to password_properties in SAM_UNK_INFO_1 because that's what
[tprouty/samba.git] / source / rpcclient / cmd_lsarpc.c
index 8afeb8e83bd1410dd0161cc9910383442d263256..c79508de8d0d7d01609cf81fdc277856824b25c5 100644 (file)
@@ -26,7 +26,7 @@
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */
-static NTSTATUS name_to_sid(struct cli_state *cli, 
+static NTSTATUS name_to_sid(struct rpc_pipe_client *cli, 
                            TALLOC_CTX *mem_ctx,
                            DOM_SID *sid, const char *name)
 {
@@ -41,17 +41,17 @@ static NTSTATUS name_to_sid(struct cli_state *cli,
                return NT_STATUS_OK;
        }
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, &sids, &sid_types);
+       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, &sids, &sid_types);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       cli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
 
        *sid = sids[0];
 
@@ -62,15 +62,18 @@ done:
 
 /* Look up domain related information on a remote host */
 
-static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli, 
                                           TALLOC_CTX *mem_ctx, int argc, 
-                                          char **argv) 
+                                          const char **argv) 
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID dom_sid;
-       GUID dom_guid;
-       fstring sid_str, domain_name="", dns_name="", forest_name="";
+       DOM_SID *dom_sid = NULL;
+       struct uuid *dom_guid;
+       char *domain_name = NULL;
+       char *dns_name = NULL;
+       char *forest_name = NULL;
+
        uint32 info_class = 3;
 
        if (argc > 2) {
@@ -84,57 +87,64 @@ static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli,
        /* Lookup info policy */
        switch (info_class) {
        case 12:
-               result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+               result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                             SEC_RIGHTS_MAXIMUM_ALLOWED,
                                             &pol);
 
                if (!NT_STATUS_IS_OK(result))
                        goto done;
-               result = cli_lsa_query_info_policy2(cli, mem_ctx, &pol,
-                                                   info_class, domain_name,
-                                                   dns_name, forest_name,
+               result = rpccli_lsa_query_info_policy2(cli, mem_ctx, &pol,
+                                                   info_class, &domain_name,
+                                                   &dns_name, &forest_name,
                                                    &dom_guid, &dom_sid);
                break;
        default:
-               result = cli_lsa_open_policy(cli, mem_ctx, True, 
+               result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
                if (!NT_STATUS_IS_OK(result))
                        goto done;
-               result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, 
-                                                  info_class, domain_name, 
+               result = rpccli_lsa_query_info_policy(cli, mem_ctx, &pol, 
+                                                  info_class, &domain_name, 
                                                   &dom_sid);
        }
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
-
-       sid_to_string(sid_str, &dom_sid);
-
-       if (domain_name[0])
-               printf("domain %s has sid %s\n", domain_name, sid_str);
-       else
+       
+       if (domain_name) {
+               if (dom_sid == NULL) {
+                       printf("got no sid for domain %s\n", domain_name);
+               } else {
+                       printf("domain %s has sid %s\n", domain_name,
+                              sid_string_static(dom_sid));
+               }
+       } else {
                printf("could not query info for level %d\n", info_class);
+       }
 
-       if (dns_name[0])
+       if (dns_name)
                printf("domain dns name is %s\n", dns_name);
-       if (forest_name[0])
+       if (forest_name)
                printf("forest name is %s\n", forest_name);
 
        if (info_class == 12) {
                printf("domain GUID is ");
-               print_guid(&dom_guid);
+               smb_uuid_string_static(*dom_guid);
        }
+
+       rpccli_lsa_close(cli, mem_ctx, &pol);
+
  done:
        return result;
 }
 
 /* Resolve a list of names to a list of sids */
 
-static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli, 
                                      TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv)
+                                     const char **argv)
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -147,14 +157,14 @@ static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli,
                return NT_STATUS_OK;
        }
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, 
+       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, 
                                      (const char**)(argv + 1), &sids, &types);
 
        if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
@@ -172,14 +182,16 @@ static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli,
                       sid_type_lookup(types[i]), types[i]);
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
+
  done:
        return result;
 }
 
 /* Resolve a list of SIDs to a list of names */
 
-static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                    int argc, char **argv)
+static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                    int argc, const char **argv)
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -194,7 +206,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
                return NT_STATUS_OK;
        }
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
@@ -203,19 +215,22 @@ static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        /* Convert arguments to sids */
 
-       sids = (DOM_SID *)talloc(mem_ctx, sizeof(DOM_SID) * (argc - 1));
+       sids = TALLOC_ARRAY(mem_ctx, DOM_SID, argc - 1);
 
        if (!sids) {
                printf("could not allocate memory for %d sids\n", argc - 1);
                goto done;
        }
 
-       for (i = 0; i < argc - 1; i++)
-               string_to_sid(&sids[i], argv[i + 1]);
+       for (i = 0; i < argc - 1; i++) 
+               if (!string_to_sid(&sids[i], argv[i + 1])) {
+                       result = NT_STATUS_INVALID_SID;
+                       goto done;
+               }
 
        /* Lookup the SIDs */
 
-       result = cli_lsa_lookup_sids(cli, mem_ctx, &pol, argc - 1, sids, 
+       result = rpccli_lsa_lookup_sids(cli, mem_ctx, &pol, argc - 1, sids, 
                                     &domains, &names, &types);
 
        if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
@@ -235,15 +250,17 @@ static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
                       names[i] ? names[i] : "*unknown*", types[i]);
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
+
  done:
        return result;
 }
 
 /* Enumerate list of trusted domains */
 
-static NTSTATUS cmd_lsa_enum_trust_dom(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli, 
                                        TALLOC_CTX *mem_ctx, int argc, 
-                                       char **argv)
+                                       const char **argv)
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -264,41 +281,48 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct cli_state *cli,
                enum_ctx = atoi(argv[2]);
        }       
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     POLICY_VIEW_LOCAL_INFORMATION,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       /* Lookup list of trusted domains */
+       result = STATUS_MORE_ENTRIES;
 
-       result = cli_lsa_enum_trust_dom(cli, mem_ctx, &pol, &enum_ctx,
-                                       &num_domains,
-                                       &domain_names, &domain_sids);
-       if (!NT_STATUS_IS_OK(result) &&
-           !NT_STATUS_EQUAL(result, NT_STATUS_NO_MORE_ENTRIES) &&
-           !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
-           goto done;
+       while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
 
-       /* Print results: list of names and sids returned in this response. */   
-       for (i = 0; i < num_domains; i++) {
-               fstring sid_str;
+               /* Lookup list of trusted domains */
+
+               result = rpccli_lsa_enum_trust_dom(cli, mem_ctx, &pol, &enum_ctx,
+                                               &num_domains,
+                                               &domain_names, &domain_sids);
+               if (!NT_STATUS_IS_OK(result) &&
+                   !NT_STATUS_EQUAL(result, NT_STATUS_NO_MORE_ENTRIES) &&
+                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
+                       goto done;
 
-               sid_to_string(sid_str, &domain_sids[i]);
-               printf("%s %s\n", domain_names[i] ? domain_names[i] : 
-                      "*unknown*", sid_str);
+               /* Print results: list of names and sids returned in this
+                * response. */  
+               for (i = 0; i < num_domains; i++) {
+                       fstring sid_str;
+
+                       sid_to_string(sid_str, &domain_sids[i]);
+                       printf("%s %s\n", domain_names[i] ? domain_names[i] : 
+                              "*unknown*", sid_str);
+               }
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
 
 /* Enumerates privileges */
 
-static NTSTATUS cmd_lsa_enum_privilege(struct cli_state *cli, 
-                                          TALLOC_CTX *mem_ctx, int argc, 
-                                          char **argv) 
+static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli, 
+                                      TALLOC_CTX *mem_ctx, int argc, 
+                                      const char **argv) 
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -322,14 +346,14 @@ static NTSTATUS cmd_lsa_enum_privilege(struct cli_state *cli,
        if (argc==3)
                pref_max_length=atoi(argv[2]);
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_enum_privilege(cli, mem_ctx, &pol, &enum_context, pref_max_length,
+       result = rpccli_lsa_enum_privilege(cli, mem_ctx, &pol, &enum_context, pref_max_length,
                                        &count, &privs_name, &privs_high, &privs_low);
 
        if (!NT_STATUS_IS_OK(result))
@@ -343,15 +367,16 @@ static NTSTATUS cmd_lsa_enum_privilege(struct cli_state *cli,
                       privs_high[i], privs_low[i], privs_high[i], privs_low[i]);
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
 
 /* Get privilege name */
 
-static NTSTATUS cmd_lsa_get_dispname(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli, 
                                      TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv) 
+                                     const char **argv) 
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -366,14 +391,14 @@ static NTSTATUS cmd_lsa_get_dispname(struct cli_state *cli,
                return NT_STATUS_OK;
        }
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_get_dispname(cli, mem_ctx, &pol, argv[1], lang_id, lang_id_sys, description, &lang_id_desc);
+       result = rpccli_lsa_get_dispname(cli, mem_ctx, &pol, argv[1], lang_id, lang_id_sys, description, &lang_id_desc);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -381,15 +406,16 @@ static NTSTATUS cmd_lsa_get_dispname(struct cli_state *cli,
        /* Print results */
        printf("%s -> %s (language: 0x%x)\n", argv[1], description, lang_id_desc);
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
 
 /* Enumerate the LSA SIDS */
 
-static NTSTATUS cmd_lsa_enum_sids(struct cli_state *cli, 
-                                     TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv) 
+static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli, 
+                                 TALLOC_CTX *mem_ctx, int argc, 
+                                 const char **argv) 
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -411,14 +437,14 @@ static NTSTATUS cmd_lsa_enum_sids(struct cli_state *cli,
        if (argc==3)
                pref_max_length=atoi(argv[2]);
 
-       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_enum_sids(cli, mem_ctx, &pol, &enum_context, pref_max_length,
+       result = rpccli_lsa_enum_sids(cli, mem_ctx, &pol, &enum_context, pref_max_length,
                                        &count, &sids);
 
        if (!NT_STATUS_IS_OK(result))
@@ -434,15 +460,59 @@ static NTSTATUS cmd_lsa_enum_sids(struct cli_state *cli,
                printf("%s\n", sid_str);
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
 
+/* Create a new account */
+
+static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli, 
+                                           TALLOC_CTX *mem_ctx, int argc, 
+                                           const char **argv) 
+{
+       POLICY_HND dom_pol;
+       POLICY_HND user_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       uint32 des_access = 0x000f000f;
+       
+       DOM_SID sid;
+
+       if (argc != 2 ) {
+               printf("Usage: %s SID\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(result))
+               goto done;      
+
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    &dom_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = rpccli_lsa_create_account(cli, mem_ctx, &dom_pol, &sid, des_access, &user_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       printf("Account for SID %s successfully created\n\n", argv[1]);
+       result = NT_STATUS_OK;
+
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+ done:
+       return result;
+}
+
+
 /* Enumerate the privileges of an SID */
 
-static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli, 
                                            TALLOC_CTX *mem_ctx, int argc, 
-                                           char **argv) 
+                                           const char **argv) 
 {
        POLICY_HND dom_pol;
        POLICY_HND user_pol;
@@ -463,19 +533,19 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;      
 
-       result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_open_account(cli, mem_ctx, &dom_pol, &sid, access_desired, &user_pol);
+       result = rpccli_lsa_open_account(cli, mem_ctx, &dom_pol, &sid, access_desired, &user_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_enum_privsaccount(cli, mem_ctx, &user_pol, &count, &set);
+       result = rpccli_lsa_enum_privsaccount(cli, mem_ctx, &user_pol, &count, &set);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -488,6 +558,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli,
                printf("%u\t%u\t%u\n", set[i].luid.high, set[i].luid.low, set[i].attr);
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -495,9 +566,9 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli,
 
 /* Enumerate the privileges of an SID via LsaEnumerateAccountRights */
 
-static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli, 
                                         TALLOC_CTX *mem_ctx, int argc, 
-                                        char **argv) 
+                                        const char **argv) 
 {
        POLICY_HND dom_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -517,14 +588,14 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;      
 
-       result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_enum_account_rights(cli, mem_ctx, &dom_pol, sid, &count, &rights);
+       result = rpccli_lsa_enum_account_rights(cli, mem_ctx, &dom_pol, &sid, &count, &rights);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -535,6 +606,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli,
                printf("\t%s\n", rights[i]);
        }
 
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -542,7 +614,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli,
 
 /* add some privileges to a SID via LsaAddAccountRights */
 
-static NTSTATUS cmd_lsa_add_acct_rights(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli, 
                                        TALLOC_CTX *mem_ctx, int argc, 
                                        const char **argv) 
 {
@@ -560,19 +632,20 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct cli_state *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;      
 
-       result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_add_account_rights(cli, mem_ctx, &dom_pol, sid, 
+       result = rpccli_lsa_add_account_rights(cli, mem_ctx, &dom_pol, sid, 
                                            argc-2, argv+2);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -580,7 +653,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct cli_state *cli,
 
 /* remove some privileges to a SID via LsaRemoveAccountRights */
 
-static NTSTATUS cmd_lsa_remove_acct_rights(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli, 
                                        TALLOC_CTX *mem_ctx, int argc, 
                                        const char **argv) 
 {
@@ -598,19 +671,21 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct cli_state *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;      
 
-       result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_remove_account_rights(cli, mem_ctx, &dom_pol, sid, 
+       result = rpccli_lsa_remove_account_rights(cli, mem_ctx, &dom_pol, sid, 
                                               False, argc-2, argv+2);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+
  done:
        return result;
 }
@@ -618,9 +693,9 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct cli_state *cli,
 
 /* Get a privilege value given its name */
 
-static NTSTATUS cmd_lsa_lookupprivvalue(struct cli_state *cli, 
-                                           TALLOC_CTX *mem_ctx, int argc, 
-                                           char **argv) 
+static NTSTATUS cmd_lsa_lookup_priv_value(struct rpc_pipe_client *cli, 
+                                       TALLOC_CTX *mem_ctx, int argc, 
+                                       const char **argv) 
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -631,14 +706,14 @@ static NTSTATUS cmd_lsa_lookupprivvalue(struct cli_state *cli,
                return NT_STATUS_OK;
        }
 
-       result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_lookupprivvalue(cli, mem_ctx, &pol, argv[1], &luid);
+       result = rpccli_lsa_lookup_priv_value(cli, mem_ctx, &pol, argv[1], &luid);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -647,15 +722,16 @@ static NTSTATUS cmd_lsa_lookupprivvalue(struct cli_state *cli,
 
        printf("%u:%u (0x%x:0x%x)\n", luid.high, luid.low, luid.high, luid.low);
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
 
 /* Query LSA security object */
 
-static NTSTATUS cmd_lsa_query_secobj(struct cli_state *cli, 
+static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli, 
                                     TALLOC_CTX *mem_ctx, int argc, 
-                                    char **argv) 
+                                    const char **argv) 
 {
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -667,14 +743,14 @@ static NTSTATUS cmd_lsa_query_secobj(struct cli_state *cli,
                return NT_STATUS_OK;
        }
 
-       result = cli_lsa_open_policy2(cli, mem_ctx, True, 
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
                                      SEC_RIGHTS_MAXIMUM_ALLOWED,
                                      &pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = cli_lsa_query_secobj(cli, mem_ctx, &pol, sec_info, &sdb);
+       result = rpccli_lsa_query_secobj(cli, mem_ctx, &pol, sec_info, &sdb);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -683,10 +759,210 @@ static NTSTATUS cmd_lsa_query_secobj(struct cli_state *cli,
 
        display_sec_desc(sdb->sec);
 
+       rpccli_lsa_close(cli, mem_ctx, &pol);
+ done:
+       return result;
+}
+
+static void display_trust_dom_info_1(TRUSTED_DOMAIN_INFO_NAME *n)
+{
+       printf("NetBIOS Name:\t%s\n", unistr2_static(&n->netbios_name.unistring));
+}
+
+static void display_trust_dom_info_3(TRUSTED_DOMAIN_INFO_POSIX_OFFSET *p)
+{
+       printf("Posix Offset:\t%08x (%d)\n", p->posix_offset, p->posix_offset);
+}
+
+static void display_trust_dom_info_4(TRUSTED_DOMAIN_INFO_PASSWORD *p, const char *password)
+{
+       char *pwd, *pwd_old;
+       
+       DATA_BLOB data     = data_blob(NULL, p->password.length);
+       DATA_BLOB data_old = data_blob(NULL, p->old_password.length);
+
+       memcpy(data.data, p->password.data, p->password.length);
+       data.length     = p->password.length;
+                               
+       memcpy(data_old.data, p->old_password.data, p->old_password.length);
+       data_old.length = p->old_password.length;
+       
+       pwd     = decrypt_trustdom_secret(password, &data);
+       pwd_old = decrypt_trustdom_secret(password, &data_old);
+       
+       d_printf("Password:\t%s\n", pwd);
+       d_printf("Old Password:\t%s\n", pwd_old);
+
+       SAFE_FREE(pwd);
+       SAFE_FREE(pwd_old);
+       
+       data_blob_free(&data);
+       data_blob_free(&data_old);
+}
+
+static void display_trust_dom_info_6(TRUSTED_DOMAIN_INFO_EX *i)
+{
+       printf("Domain Name:\t\t%s\n", unistr2_static(&i->domain_name.unistring));
+       printf("NetBIOS Name:\t\t%s\n", unistr2_static(&i->netbios_name.unistring));
+       printf("SID:\t\t\t%s\n", sid_string_static(&i->sid.sid));
+       printf("Trust Direction:\t0x%08x\n", i->trust_direction);
+       printf("Trust Type:\t\t0x%08x\n", i->trust_type);
+       printf("Trust Attributes:\t0x%08x\n", i->trust_attributes);
+}
+
+
+static void display_trust_dom_info(LSA_TRUSTED_DOMAIN_INFO *info, uint32 info_class, const char *pass)
+{
+       switch (info_class) {
+       case 1:
+               display_trust_dom_info_1(&info->name);
+               break;
+       case 3:
+               display_trust_dom_info_3(&info->posix_offset);
+               break;
+       case 4:
+               display_trust_dom_info_4(&info->password, pass);
+               break;
+       case 6:
+               display_trust_dom_info_6(&info->info_ex);
+               break;
+       default:
+               printf("unsupported info-class: %d\n", info_class);
+               break;
+       }
+}
+
+static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
+                                               TALLOC_CTX *mem_ctx, int argc, 
+                                               const char **argv) 
+{
+       POLICY_HND pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       DOM_SID dom_sid;
+       uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       LSA_TRUSTED_DOMAIN_INFO *info;
+
+       uint32 info_class = 1; 
+
+       if (argc > 3 || argc < 2) {
+               printf("Usage: %s [sid] [info_class]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       if (!string_to_sid(&dom_sid, argv[1]))
+               return NT_STATUS_NO_MEMORY;
+
+       if (argc == 3)
+               info_class = atoi(argv[2]);
+
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = rpccli_lsa_query_trusted_domain_info_by_sid(cli, mem_ctx, &pol,
+                                                         info_class, &dom_sid, &info);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       display_trust_dom_info(info, info_class, cli->pwd.password);
+
  done:
+       if (&pol)
+               rpccli_lsa_close(cli, mem_ctx, &pol);
+
        return result;
 }
 
+static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
+                                                TALLOC_CTX *mem_ctx, int argc,
+                                                const char **argv) 
+{
+       POLICY_HND pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       LSA_TRUSTED_DOMAIN_INFO *info;
+       uint32 info_class = 1; 
+
+       if (argc > 3 || argc < 2) {
+               printf("Usage: %s [name] [info_class]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       if (argc == 3)
+               info_class = atoi(argv[2]);
+
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = rpccli_lsa_query_trusted_domain_info_by_name(cli, mem_ctx, &pol, 
+                                                          info_class, argv[1], &info);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       display_trust_dom_info(info, info_class, cli->pwd.password);
+
+ done:
+       if (&pol)
+               rpccli_lsa_close(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
+                                          TALLOC_CTX *mem_ctx, int argc,
+                                          const char **argv) 
+{
+       POLICY_HND pol, trustdom_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       LSA_TRUSTED_DOMAIN_INFO *info;
+       DOM_SID dom_sid;
+       uint32 info_class = 1; 
+
+       if (argc > 3 || argc < 2) {
+               printf("Usage: %s [sid] [info_class]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       if (!string_to_sid(&dom_sid, argv[1]))
+               return NT_STATUS_NO_MEMORY;
+
+
+       if (argc == 3)
+               info_class = atoi(argv[2]);
+
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+       
+       result = rpccli_lsa_open_trusted_domain(cli, mem_ctx, &pol,
+                                            &dom_sid, access_mask, &trustdom_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = rpccli_lsa_query_trusted_domain_info(cli, mem_ctx, &trustdom_pol, 
+                                                  info_class, &info);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       display_trust_dom_info(info, info_class, cli->pwd.password);
+
+ done:
+       if (&pol)
+               rpccli_lsa_close(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+
 
 /* List of commands exported by this module */
 
@@ -694,19 +970,28 @@ struct cmd_set lsarpc_commands[] = {
 
        { "LSARPC" },
 
-       { "lsaquery",            cmd_lsa_query_info_policy,  PI_LSARPC, "Query info policy",                    "" },
-       { "lookupsids",          cmd_lsa_lookup_sids,        PI_LSARPC, "Convert SIDs to names",                "" },
-       { "lookupnames",         cmd_lsa_lookup_names,       PI_LSARPC, "Convert names to SIDs",                "" },
-       { "enumtrust",           cmd_lsa_enum_trust_dom,     PI_LSARPC, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
-       { "enumprivs",           cmd_lsa_enum_privilege,     PI_LSARPC, "Enumerate privileges",                 "" },
-       { "getdispname",         cmd_lsa_get_dispname,       PI_LSARPC, "Get the privilege name",               "" },
-       { "lsaenumsid",          cmd_lsa_enum_sids,          PI_LSARPC, "Enumerate the LSA SIDS",               "" },
-       { "lsaenumprivsaccount", cmd_lsa_enum_privsaccounts, PI_LSARPC, "Enumerate the privileges of an SID",   "" },
-       { "lsaenumacctrights",   cmd_lsa_enum_acct_rights,   PI_LSARPC, "Enumerate the rights of an SID",   "" },
-       { "lsaaddacctrights",    cmd_lsa_add_acct_rights,    PI_LSARPC, "Add rights to an account",   "" },
-       { "lsaremoveacctrights", cmd_lsa_remove_acct_rights, PI_LSARPC, "Remove rights from an account",   "" },
-       { "lsalookupprivvalue",  cmd_lsa_lookupprivvalue,    PI_LSARPC, "Get a privilege value given its name", "" },
-       { "lsaquerysecobj",      cmd_lsa_query_secobj,       PI_LSARPC, "Query LSA security object", "" },
+       { "lsaquery",            RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, PI_LSARPC, NULL, "Query info policy",                    "" },
+       { "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, PI_LSARPC, NULL, "Convert SIDs to names",                "" },
+       { "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, PI_LSARPC, NULL, "Convert names to SIDs",                "" },
+       { "enumtrust",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, PI_LSARPC, NULL, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
+       { "enumprivs",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, PI_LSARPC, NULL, "Enumerate privileges",                 "" },
+       { "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,       NULL, PI_LSARPC, NULL, "Get the privilege name",               "" },
+       { "lsaenumsid",          RPC_RTYPE_NTSTATUS, cmd_lsa_enum_sids,          NULL, PI_LSARPC, NULL, "Enumerate the LSA SIDS",               "" },
+       { "lsacreateaccount",    RPC_RTYPE_NTSTATUS, cmd_lsa_create_account,     NULL, PI_LSARPC, NULL, "Create a new lsa account",   "" },
+       { "lsaenumprivsaccount", RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privsaccounts, NULL, PI_LSARPC, NULL, "Enumerate the privileges of an SID",   "" },
+       { "lsaenumacctrights",   RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_rights,   NULL, PI_LSARPC, NULL, "Enumerate the rights of an SID",   "" },
+#if 0
+       { "lsaaddpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_add_priv,           NULL, PI_LSARPC, "Assign a privilege to a SID", "" },
+       { "lsadelpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_del_priv,           NULL, PI_LSARPC, "Revoke a privilege from a SID", "" },
+#endif
+       { "lsaaddacctrights",    RPC_RTYPE_NTSTATUS, cmd_lsa_add_acct_rights,    NULL, PI_LSARPC, NULL, "Add rights to an account",   "" },
+       { "lsaremoveacctrights", RPC_RTYPE_NTSTATUS, cmd_lsa_remove_acct_rights, NULL, PI_LSARPC, NULL, "Remove rights from an account",   "" },
+       { "lsalookupprivvalue",  RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_priv_value,  NULL, PI_LSARPC, NULL, "Get a privilege value given its name", "" },
+       { "lsaquerysecobj",      RPC_RTYPE_NTSTATUS, cmd_lsa_query_secobj,       NULL, PI_LSARPC, NULL, "Query LSA security object", "" },
+       { "lsaquerytrustdominfo",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfo, NULL, PI_LSARPC, NULL, "Query LSA trusted domains info (given a SID)", "" },
+       { "lsaquerytrustdominfobyname",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobyname, NULL, PI_LSARPC, NULL, "Query LSA trusted domains info (given a name), only works for Windows > 2k", "" },
+       { "lsaquerytrustdominfobysid",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobysid, NULL, PI_LSARPC, NULL, "Query LSA trusted domains info (given a SID)", "" },
 
        { NULL }
 };
+