s3-rpcclient: add lookupnames4 command.
[ira/wip.git] / source3 / rpcclient / cmd_lsarpc.c
index 746fc25d7d50fadd401db90bcf0ec5a655737982..623cd5e1bce7a9efa7502149b93aa15cb17d1366 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../libcli/auth/libcli_auth.h"
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */
@@ -29,7 +30,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
                            TALLOC_CTX *mem_ctx,
                            DOM_SID *sid, const char *name)
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        enum lsa_SidType *sid_types;
        NTSTATUS result;
        DOM_SID *sids;
@@ -41,7 +42,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -61,12 +62,11 @@ done:
 static void display_query_info_1(struct lsa_AuditLogInfo *r)
 {
        d_printf("percent_full:\t%d\n", r->percent_full);
-       d_printf("log_size:\t%d\n", r->log_size);
+       d_printf("maximum_log_size:\t%d\n", r->maximum_log_size);
        d_printf("retention_time:\t%lld\n", (long long)r->retention_time);
        d_printf("shutdown_in_progress:\t%d\n", r->shutdown_in_progress);
        d_printf("time_to_shutdown:\t%lld\n", (long long)r->time_to_shutdown);
        d_printf("next_audit_record:\t%d\n", r->next_audit_record);
-       d_printf("unknown:\t%d\n", r->unknown);
 }
 
 static void display_query_info_2(struct lsa_AuditEventsInfo *r)
@@ -103,7 +103,6 @@ static void display_query_info_11(struct lsa_AuditFullQueryInfo *r)
 {
        d_printf("Shutdown on full: %d\n", r->shutdown_on_full);
        d_printf("Log is full: %d\n", r->log_is_full);
-       d_printf("Unknown: %d\n", r->unknown);
 }
 
 static void display_query_info_12(struct lsa_DnsDomainInfo *r)
@@ -151,7 +150,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx, int argc, 
                                           const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        union lsa_PolicyInformation *info = NULL;
 
@@ -168,7 +167,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
        switch (info_class) {
        case 12:
                result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                                SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                                SEC_FLAG_MAXIMUM_ALLOWED,
                                                 &pol);
 
                if (!NT_STATUS_IS_OK(result))
@@ -181,7 +180,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
                break;
        default:
                result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                               SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                               SEC_FLAG_MAXIMUM_ALLOWED,
                                                &pol);
 
                if (!NT_STATUS_IS_OK(result))
@@ -209,7 +208,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx, int argc, 
                                      const char **argv)
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        DOM_SID *sids;
        enum lsa_SidType *types;
@@ -221,7 +220,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -257,7 +256,7 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx, int argc, 
                                           const char **argv)
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        DOM_SID *sids;
        enum lsa_SidType *types;
@@ -269,7 +268,7 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -301,13 +300,64 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli,
        return result;
 }
 
+static NTSTATUS cmd_lsa_lookup_names4(struct rpc_pipe_client *cli,
+                                     TALLOC_CTX *mem_ctx, int argc,
+                                     const char **argv)
+{
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       uint32_t num_names;
+       struct lsa_String *names;
+       struct lsa_RefDomainList *domains;
+       struct lsa_TransSidArray3 sids;
+       uint32_t count = 0;
+       int i;
+
+       if (argc == 1) {
+               printf("Usage: %s [name1 [name2 [...]]]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       ZERO_STRUCT(sids);
+
+       num_names = argc-1;
+       names = talloc_array(mem_ctx, struct lsa_String, num_names);
+       NT_STATUS_HAVE_NO_MEMORY(names);
+
+       for (i=0; i < num_names; i++) {
+               init_lsa_String(&names[i], argv[i+1]);
+       }
+
+       result = rpccli_lsa_LookupNames4(cli, mem_ctx,
+                                        num_names,
+                                        names,
+                                        &domains,
+                                        &sids,
+                                        1,
+                                        &count,
+                                        0,
+                                        0);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
+
+       for (i = 0; i < sids.count; i++) {
+               fstring sid_str;
+               sid_to_fstring(sid_str, sids.sids[i].sid);
+               printf("%s %s (%s: %d)\n", argv[i+1], sid_str,
+                      sid_type_lookup(sids.sids[i].sid_type),
+                      sids.sids[i].sid_type);
+       }
+
+       return result;
+}
 
 /* Resolve a list of SIDs to a list of names */
 
 static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                                     int argc, const char **argv)
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        DOM_SID *sids;
        char **domains;
@@ -321,7 +371,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
        }
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -376,7 +426,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx, int argc, 
                                        const char **argv)
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_DomainList domain_list;
 
@@ -441,7 +491,7 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx, int argc, 
                                       const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_PrivArray priv_array;
 
@@ -461,7 +511,7 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
                pref_max_length=atoi(argv[2]);
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -498,7 +548,7 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx, int argc, 
                                      const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
        uint16 lang_id=0;
@@ -513,7 +563,7 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -546,7 +596,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
                                  TALLOC_CTX *mem_ctx, int argc, 
                                  const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
        uint32 enum_context=0;
@@ -566,7 +616,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
                pref_max_length=atoi(argv[2]);
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -602,8 +652,8 @@ 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;
+       struct policy_handle dom_pol;
+       struct policy_handle user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        uint32 des_access = 0x000f000f;
        
@@ -619,7 +669,7 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
                goto done;      
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -649,8 +699,8 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx, int argc, 
                                            const char **argv) 
 {
-       POLICY_HND dom_pol;
-       POLICY_HND user_pol;
+       struct policy_handle dom_pol;
+       struct policy_handle user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        uint32 access_desired = 0x000f000f;
        DOM_SID sid;
@@ -667,7 +717,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
                goto done;      
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -712,7 +762,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                                         TALLOC_CTX *mem_ctx, int argc, 
                                         const char **argv) 
 {
-       POLICY_HND dom_pol;
+       struct policy_handle dom_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        DOM_SID sid;
        struct lsa_RightSet rights;
@@ -729,7 +779,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                goto done;      
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -762,7 +812,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx, int argc, 
                                        const char **argv) 
 {
-       POLICY_HND dom_pol;
+       struct policy_handle dom_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_RightSet rights;
        DOM_SID sid;
@@ -778,7 +828,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
                goto done;      
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -791,7 +841,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
                return NT_STATUS_NO_MEMORY;
        }
 
-       for (i=0; i<argc-1; i++) {
+       for (i=0; i<argc-2; i++) {
                init_lsa_StringLarge(&rights.names[i], argv[i+2]);
        }
 
@@ -815,7 +865,7 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx, int argc, 
                                        const char **argv) 
 {
-       POLICY_HND dom_pol;
+       struct policy_handle dom_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_RightSet rights;
        DOM_SID sid;
@@ -831,7 +881,7 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
                goto done;      
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -870,7 +920,7 @@ static NTSTATUS cmd_lsa_lookup_priv_value(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx, int argc, 
                                        const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_LUID luid;
        struct lsa_String name;
@@ -881,7 +931,7 @@ static NTSTATUS cmd_lsa_lookup_priv_value(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
        if (!NT_STATUS_IS_OK(result))
@@ -912,7 +962,7 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx, int argc, 
                                     const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        SEC_DESC_BUF *sdb;
        uint32 sec_info = DACL_SECURITY_INFORMATION;
@@ -923,7 +973,7 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
-                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                      &pol);
 
        if (argc == 2) 
@@ -949,27 +999,22 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
 }
 
 static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
-                                    uint8_t nt_hash[16])
+                                    uint8_t session_key[16])
 {
        char *pwd, *pwd_old;
        
-       DATA_BLOB data     = data_blob(NULL, p->password->length);
-       DATA_BLOB data_old = data_blob(NULL, p->old_password->length);
+       DATA_BLOB data     = data_blob_const(p->password->data, p->password->length);
+       DATA_BLOB data_old = data_blob_const(p->old_password->data, p->old_password->length);
+       DATA_BLOB session_key_blob = data_blob_const(session_key, sizeof(session_key));
 
-       memcpy(data.data, p->password->data, p->password->length);
-       memcpy(data_old.data, p->old_password->data, p->old_password->length);
-       
-       pwd     = decrypt_trustdom_secret(nt_hash, &data);
-       pwd_old = decrypt_trustdom_secret(nt_hash, &data_old);
+       pwd     = sess_decrypt_string(talloc_tos(), &data, &session_key_blob);
+       pwd_old = sess_decrypt_string(talloc_tos(), &data_old, &session_key_blob);
        
        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);
+       talloc_free(pwd);
+       talloc_free(pwd_old);
 }
 
 static void display_trust_dom_info(TALLOC_CTX *mem_ctx,
@@ -998,10 +1043,10 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
                                                TALLOC_CTX *mem_ctx, int argc, 
                                                const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        DOM_SID dom_sid;
-       uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        union lsa_TrustedDomainInfo *info = NULL;
        enum lsa_TrustDomInfoEnum info_class = 1;
        uint8_t nt_hash[16];
@@ -1047,9 +1092,9 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
                                                 TALLOC_CTX *mem_ctx, int argc,
                                                 const char **argv) 
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        union lsa_TrustedDomainInfo *info = NULL;
        enum lsa_TrustDomInfoEnum info_class = 1;
        struct lsa_String trusted_domain;
@@ -1095,9 +1140,9 @@ 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;
+       struct policy_handle pol, trustdom_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        union lsa_TrustedDomainInfo *info = NULL;
        DOM_SID dom_sid;
        enum lsa_TrustDomInfoEnum info_class = 1;
@@ -1154,7 +1199,7 @@ static NTSTATUS cmd_lsa_get_username(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx, int argc,
                                      const char **argv)
 {
-       POLICY_HND pol;
+       struct policy_handle pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        const char *servername = cli->desthost;
        struct lsa_String *account_name = NULL;
@@ -1166,7 +1211,7 @@ static NTSTATUS cmd_lsa_get_username(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy(cli, mem_ctx, true,
-                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       SEC_FLAG_MAXIMUM_ALLOWED,
                                        &pol);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -1184,7 +1229,8 @@ static NTSTATUS cmd_lsa_get_username(struct rpc_pipe_client *cli,
        /* Print results */
 
        printf("Account Name: %s, Authority Name: %s\n",
-               account_name->string, authority_name->string);
+               account_name->string, authority_name ? authority_name->string :
+               "");
 
        rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
@@ -1195,7 +1241,7 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx, int argc,
                                 const char **argv)
 {
-       POLICY_HND dom_pol, user_pol;
+       struct policy_handle dom_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_PrivilegeSet privs;
        struct lsa_LUIDAttribute *set = NULL;
@@ -1215,7 +1261,7 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
                                         &dom_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -1225,7 +1271,7 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
        result = rpccli_lsa_OpenAccount(cli, mem_ctx,
                                        &dom_pol,
                                        &sid,
-                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       SEC_FLAG_MAXIMUM_ALLOWED,
                                        &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -1279,7 +1325,7 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx, int argc,
                                 const char **argv)
 {
-       POLICY_HND dom_pol, user_pol;
+       struct policy_handle dom_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct lsa_PrivilegeSet privs;
        struct lsa_LUIDAttribute *set = NULL;
@@ -1299,7 +1345,7 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
        }
 
        result = rpccli_lsa_open_policy2(cli, mem_ctx, True,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
                                         &dom_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -1309,7 +1355,7 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
        result = rpccli_lsa_OpenAccount(cli, mem_ctx,
                                        &dom_pol,
                                        &sid,
-                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       SEC_FLAG_MAXIMUM_ALLOWED,
                                        &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -1361,6 +1407,366 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
        return result;
 }
 
+static NTSTATUS cmd_lsa_create_secret(struct rpc_pipe_client *cli,
+                                     TALLOC_CTX *mem_ctx, int argc,
+                                     const char **argv)
+{
+       NTSTATUS status;
+       struct policy_handle handle, sec_handle;
+       struct lsa_String name;
+
+       if (argc < 2) {
+               printf("Usage: %s name\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       status = rpccli_lsa_CreateSecret(cli, mem_ctx,
+                                        &handle,
+                                        name,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &sec_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&sec_handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+       }
+       if (is_valid_policy_hnd(&handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &handle);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_delete_secret(struct rpc_pipe_client *cli,
+                                     TALLOC_CTX *mem_ctx, int argc,
+                                     const char **argv)
+{
+       NTSTATUS status;
+       struct policy_handle handle, sec_handle;
+       struct lsa_String name;
+
+       if (argc < 2) {
+               printf("Usage: %s name\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       status = rpccli_lsa_OpenSecret(cli, mem_ctx,
+                                      &handle,
+                                      name,
+                                      SEC_FLAG_MAXIMUM_ALLOWED,
+                                      &sec_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       status = rpccli_lsa_DeleteObject(cli, mem_ctx,
+                                        &sec_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&sec_handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+       }
+       if (is_valid_policy_hnd(&handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &handle);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_query_secret(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx, int argc,
+                                    const char **argv)
+{
+       NTSTATUS status;
+       struct policy_handle handle, sec_handle;
+       struct lsa_String name;
+       struct lsa_DATA_BUF_PTR new_val;
+       NTTIME new_mtime = 0;
+       struct lsa_DATA_BUF_PTR old_val;
+       NTTIME old_mtime = 0;
+       DATA_BLOB session_key;
+       DATA_BLOB new_blob = data_blob_null;
+       DATA_BLOB old_blob = data_blob_null;
+       char *new_secret, *old_secret;
+
+       if (argc < 2) {
+               printf("Usage: %s name\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       status = rpccli_lsa_OpenSecret(cli, mem_ctx,
+                                      &handle,
+                                      name,
+                                      SEC_FLAG_MAXIMUM_ALLOWED,
+                                      &sec_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       ZERO_STRUCT(new_val);
+       ZERO_STRUCT(old_val);
+
+       status = rpccli_lsa_QuerySecret(cli, mem_ctx,
+                                       &sec_handle,
+                                       &new_val,
+                                       &new_mtime,
+                                       &old_val,
+                                       &old_mtime);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       if (new_val.buf) {
+               new_blob = data_blob_const(new_val.buf->data, new_val.buf->length);
+       }
+       if (old_val.buf) {
+               old_blob = data_blob_const(old_val.buf->data, old_val.buf->length);
+       }
+
+       new_secret = sess_decrypt_string(mem_ctx, &new_blob, &session_key);
+       old_secret = sess_decrypt_string(mem_ctx, &old_blob, &session_key);
+       if (new_secret) {
+               d_printf("new secret: %s\n", new_secret);
+       }
+       if (old_secret) {
+               d_printf("old secret: %s\n", old_secret);
+       }
+
+ done:
+       if (is_valid_policy_hnd(&sec_handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+       }
+       if (is_valid_policy_hnd(&handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &handle);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_set_secret(struct rpc_pipe_client *cli,
+                                  TALLOC_CTX *mem_ctx, int argc,
+                                  const char **argv)
+{
+       NTSTATUS status;
+       struct policy_handle handle, sec_handle;
+       struct lsa_String name;
+       struct lsa_DATA_BUF new_val;
+       struct lsa_DATA_BUF old_val;
+       DATA_BLOB enc_key;
+       DATA_BLOB session_key;
+
+       if (argc < 3) {
+               printf("Usage: %s name secret\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       status = rpccli_lsa_OpenSecret(cli, mem_ctx,
+                                      &handle,
+                                      name,
+                                      SEC_FLAG_MAXIMUM_ALLOWED,
+                                      &sec_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       ZERO_STRUCT(new_val);
+       ZERO_STRUCT(old_val);
+
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       enc_key = sess_encrypt_string(argv[2], &session_key);
+
+       new_val.length = enc_key.length;
+       new_val.size = enc_key.length;
+       new_val.data = enc_key.data;
+
+       status = rpccli_lsa_SetSecret(cli, mem_ctx,
+                                     &sec_handle,
+                                     &new_val,
+                                     NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&sec_handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+       }
+       if (is_valid_policy_hnd(&handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &handle);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_retrieve_private_data(struct rpc_pipe_client *cli,
+                                             TALLOC_CTX *mem_ctx, int argc,
+                                             const char **argv)
+{
+       NTSTATUS status;
+       struct policy_handle handle;
+       struct lsa_String name;
+       struct lsa_DATA_BUF *val;
+       DATA_BLOB session_key;
+       DATA_BLOB blob;
+       char *secret;
+
+       if (argc < 2) {
+               printf("Usage: %s name\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       ZERO_STRUCT(val);
+
+       status = rpccli_lsa_RetrievePrivateData(cli, mem_ctx,
+                                               &handle,
+                                               &name,
+                                               &val);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       if (val) {
+               blob = data_blob_const(val->data, val->length);
+       }
+
+       secret = sess_decrypt_string(mem_ctx, &blob, &session_key);
+       if (secret) {
+               d_printf("secret: %s\n", secret);
+       }
+
+ done:
+       if (is_valid_policy_hnd(&handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &handle);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_store_private_data(struct rpc_pipe_client *cli,
+                                          TALLOC_CTX *mem_ctx, int argc,
+                                          const char **argv)
+{
+       NTSTATUS status;
+       struct policy_handle handle;
+       struct lsa_String name;
+       struct lsa_DATA_BUF val;
+       DATA_BLOB session_key;
+       DATA_BLOB enc_key;
+
+       if (argc < 3) {
+               printf("Usage: %s name secret\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       ZERO_STRUCT(val);
+
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       enc_key = sess_encrypt_string(argv[2], &session_key);
+
+       val.length = enc_key.length;
+       val.size = enc_key.length;
+       val.data = enc_key.data;
+
+       status = rpccli_lsa_StorePrivateData(cli, mem_ctx,
+                                            &handle,
+                                            &name,
+                                            &val);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&handle)) {
+               rpccli_lsa_Close(cli, mem_ctx, &handle);
+       }
+
+       return status;
+}
+
 
 /* List of commands exported by this module */
 
@@ -1371,6 +1777,7 @@ struct cmd_set lsarpc_commands[] = {
        { "lsaquery",            RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query info policy",                    "" },
        { "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert SIDs to names",                "" },
        { "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
+       { "lookupnames4",        RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names4,      NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
        { "lookupnames_level",   RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names_level, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
        { "enumtrust",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
        { "enumprivs",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate privileges",                 "" },
@@ -1389,6 +1796,12 @@ struct cmd_set lsarpc_commands[] = {
        { "lsaquerytrustdominfobyname",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobyname, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a name), only works for Windows > 2k", "" },
        { "lsaquerytrustdominfobysid",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobysid, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a SID)", "" },
        { "getusername",          RPC_RTYPE_NTSTATUS, cmd_lsa_get_username, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get username", "" },
+       { "createsecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_create_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create Secret", "" },
+       { "deletesecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_delete_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Delete Secret", "" },
+       { "querysecret",          RPC_RTYPE_NTSTATUS, cmd_lsa_query_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query Secret", "" },
+       { "setsecret",            RPC_RTYPE_NTSTATUS, cmd_lsa_set_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Set Secret", "" },
+       { "retrieveprivatedata",  RPC_RTYPE_NTSTATUS, cmd_lsa_retrieve_private_data, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Retrieve Private Data", "" },
+       { "storeprivatedata",     RPC_RTYPE_NTSTATUS, cmd_lsa_store_private_data, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Store Private Data", "" },
 
        { NULL }
 };