Merge branch 'master' of /home/tridge/samba/git/combined
[samba.git] / source3 / rpc_client / cli_lsarpc.c
index 45b7509d45144e343377b1edb5fb308630f440ff..aa883d3cf105780bb7f1551e6d33d70787fcd39a 100644 (file)
@@ -1,26 +1,25 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    RPC pipe client
    Copyright (C) Tim Potter                        2000-2001,
    Copyright (C) Andrew Tridgell              1992-1997,2000,
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997,2000,
-   Copyright (C) Paul Ashton                       1997,2000,
-   Copyright (C) Elrond                                 2000,
    Copyright (C) Rafal Szczesniak                       2002
-   
+   Copyright (C) Jeremy Allison                                2005.
+   Copyright (C) Michael Adam                          2007.
+   Copyright (C) Guenther Deschner                     2008.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
  *
  * @param cli Handle on an initialised SMB connection */
 
-NTSTATUS cli_lsa_open_policy(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             BOOL sec_qos, uint32 des_access, POLICY_HND *pol)
+NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               bool sec_qos, uint32 des_access,
+                               struct policy_handle *pol)
 {
-       prs_struct qbuf, rbuf;
-       LSA_Q_OPEN_POL q;
-       LSA_R_OPEN_POL r;
-       LSA_SEC_QOS qos;
-       NTSTATUS result;
+       struct lsa_ObjectAttribute attr;
+       struct lsa_QosInfo qos;
+       uint16_t system_name = '\\';
 
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+       ZERO_STRUCT(attr);
 
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Initialise input parameters */
+       attr.len        = 0x18;
 
        if (sec_qos) {
-               init_lsa_sec_qos(&qos, 2, 1, 0);
-               init_q_open_pol(&q, '\\', 0, des_access, &qos);
-       } else {
-               init_q_open_pol(&q, '\\', 0, des_access, NULL);
-       }
-
-       /* Marshall data and send request */
-
-       if (!lsa_io_q_open_pol("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_OPENPOLICY, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_open_pol("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Return output parameters */
+               qos.len                 = 0xc;
+               qos.impersonation_level = 2;
+               qos.context_mode        = 1;
+               qos.effective_only      = 0;
 
-       if (NT_STATUS_IS_OK(result = r.status)) {
-               *pol = r.pol;
-#ifdef __INSURE__
-               pol->marker = MALLOC(1);
-#endif
+               attr.sec_qos            = &qos;
        }
 
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
+       return rpccli_lsa_OpenPolicy(cli, mem_ctx,
+                                    &system_name,
+                                    &attr,
+                                    des_access,
+                                    pol);
 }
 
 /** Open a LSA policy handle
   *
-  * @param cli Handle on an initialised SMB connection 
+  * @param cli Handle on an initialised SMB connection
   */
 
-NTSTATUS cli_lsa_open_policy2(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                              BOOL sec_qos, uint32 des_access, POLICY_HND *pol)
+NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx, bool sec_qos,
+                                uint32 des_access, struct policy_handle *pol)
 {
-       prs_struct qbuf, rbuf;
-       LSA_Q_OPEN_POL2 q;
-       LSA_R_OPEN_POL2 r;
-       LSA_SEC_QOS qos;
-       NTSTATUS result;
+       struct lsa_ObjectAttribute attr;
+       struct lsa_QosInfo qos;
 
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+       ZERO_STRUCT(attr);
 
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Initialise input parameters */
+       attr.len        = 0x18;
 
        if (sec_qos) {
-               init_lsa_sec_qos(&qos, 2, 1, 0);
-               init_q_open_pol2(&q, cli->srv_name_slash, 0, des_access, 
-                                 &qos);
-       } else {
-               init_q_open_pol2(&q, cli->srv_name_slash, 0, des_access, 
-                                 NULL);
-       }
-
-       /* Marshall data and send request */
-
-       if (!lsa_io_q_open_pol2("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_OPENPOLICY2, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_open_pol2("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Return output parameters */
+               qos.len                 = 0xc;
+               qos.impersonation_level = 2;
+               qos.context_mode        = 1;
+               qos.effective_only      = 0;
 
-       if (NT_STATUS_IS_OK(result = r.status)) {
-               *pol = r.pol;
-#ifdef __INSURE__
-               pol->marker = (char *)malloc(1);
-#endif
+               attr.sec_qos            = &qos;
        }
 
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
+       return rpccli_lsa_OpenPolicy2(cli, mem_ctx,
+                                     cli->srv_name_slash,
+                                     &attr,
+                                     des_access,
+                                     pol);
 }
 
-/** Close a LSA policy handle */
-
-NTSTATUS cli_lsa_close(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-                       POLICY_HND *pol)
+/* Lookup a list of sids
+ *
+ * internal version withOUT memory allocation of the target arrays.
+ * this assumes suffciently sized arrays to store domains, names and types. */
+
+static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct rpc_pipe_client *cli,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct policy_handle *pol,
+                                              int num_sids,
+                                              const DOM_SID *sids,
+                                              char **domains,
+                                              char **names,
+                                              enum lsa_SidType *types,
+                                              bool use_lookupsids3)
 {
-       prs_struct qbuf, rbuf;
-       LSA_Q_CLOSE q;
-       LSA_R_CLOSE r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_lsa_q_close(&q, pol);
-
-       if (!lsa_io_q_close("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_CLOSE, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
+       NTSTATUS result = NT_STATUS_OK;
+       TALLOC_CTX *tmp_ctx = NULL;
+       int i;
+       struct lsa_SidArray sid_array;
+       struct lsa_RefDomainList *ref_domains = NULL;
+       struct lsa_TransNameArray lsa_names;
+       uint32_t count = 0;
+       uint16_t level = 1;
 
-       /* Unmarshall response */
+       ZERO_STRUCT(lsa_names);
 
-       if (!lsa_io_r_close("", &r, &rbuf, 0)) {
+       tmp_ctx = talloc_new(mem_ctx);
+       if (!tmp_ctx) {
+               DEBUG(0, ("rpccli_lsa_lookup_sids_noalloc: out of memory!\n"));
                result = NT_STATUS_UNSUCCESSFUL;
                goto done;
        }
 
-       /* Return output parameters */
-
-       if (NT_STATUS_IS_OK(result = r.status)) {
-#ifdef __INSURE__
-               SAFE_FREE(pol->marker);
-#endif
-               *pol = r.pol;
+       sid_array.num_sids = num_sids;
+       sid_array.sids = TALLOC_ARRAY(mem_ctx, struct lsa_SidPtr, num_sids);
+       if (!sid_array.sids) {
+               return NT_STATUS_NO_MEMORY;
        }
 
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Lookup a list of sids */
-
-NTSTATUS cli_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             POLICY_HND *pol, int num_sids, const DOM_SID *sids, 
-                             char ***domains, char ***names, uint32 **types)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_LOOKUP_SIDS q;
-       LSA_R_LOOKUP_SIDS r;
-       DOM_R_REF ref;
-       LSA_TRANS_NAME_ENUM t_names;
-       NTSTATUS result;
-       int i;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_q_lookup_sids(mem_ctx, &q, pol, num_sids, sids, 1);
-
-       if (!lsa_io_q_lookup_sids("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_LOOKUPSIDS, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
+       for (i = 0; i<num_sids; i++) {
+               sid_array.sids[i].sid = sid_dup_talloc(mem_ctx, &sids[i]);
+               if (!sid_array.sids[i].sid) {
+                       return NT_STATUS_NO_MEMORY;
+               }
        }
 
-       /* Unmarshall response */
-
-       ZERO_STRUCT(ref);
-       ZERO_STRUCT(t_names);
-
-       r.dom_ref = &ref;
-       r.names = &t_names;
+       if (use_lookupsids3) {
+               struct lsa_TransNameArray2 lsa_names2;
+               uint32_t n;
+
+               result = rpccli_lsa_LookupSids3(cli, mem_ctx,
+                                               &sid_array,
+                                               &ref_domains,
+                                               &lsa_names2,
+                                               level,
+                                               &count,
+                                               0,
+                                               0);
+
+               if (!NT_STATUS_IS_ERR(result)) {
+                       lsa_names.count = lsa_names2.count;
+                       lsa_names.names = talloc_array(mem_ctx, struct lsa_TranslatedName, lsa_names.count);
+                       if (!lsa_names.names) {
+                               return NT_STATUS_NO_MEMORY;
+                       }
+                       for (n=0; n < lsa_names.count; n++) {
+                               lsa_names.names[n].sid_type     = lsa_names2.names[n].sid_type;
+                               lsa_names.names[n].name         = lsa_names2.names[n].name;
+                               lsa_names.names[n].sid_index    = lsa_names2.names[n].sid_index;
+                       }
+               }
 
-       if (!lsa_io_r_lookup_sids("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
+       } else {
+               result = rpccli_lsa_LookupSids(cli, mem_ctx,
+                                              pol,
+                                              &sid_array,
+                                              &ref_domains,
+                                              &lsa_names,
+                                              level,
+                                              &count);
        }
 
-       result = r.status;
+       DEBUG(10, ("LSA_LOOKUPSIDS returned '%s', mapped count = %d'\n",
+                  nt_errstr(result), count));
 
        if (!NT_STATUS_IS_OK(result) &&
-           NT_STATUS_V(result) != NT_STATUS_V(STATUS_SOME_UNMAPPED)) {
-         
+           !NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) &&
+           !NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED))
+       {
                /* An actual error occured */
-
                goto done;
        }
 
        /* Return output parameters */
 
-       if (r.mapped_count == 0) {
+       if (NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) ||
+           (count == 0))
+       {
+               for (i = 0; i < num_sids; i++) {
+                       (names)[i] = NULL;
+                       (domains)[i] = NULL;
+                       (types)[i] = SID_NAME_UNKNOWN;
+               }
                result = NT_STATUS_NONE_MAPPED;
                goto done;
        }
 
-       if (!((*domains) = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
-               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!((*names) = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
-               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!((*types) = TALLOC_ARRAY(mem_ctx, uint32, num_sids))) {
-               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-               
        for (i = 0; i < num_sids; i++) {
-               fstring name, dom_name;
-               uint32 dom_idx = t_names.name[i].domain_idx;
+               const char *name, *dom_name;
+               uint32_t dom_idx = lsa_names.names[i].sid_index;
 
                /* Translate optimised name through domain index array */
 
                if (dom_idx != 0xffffffff) {
 
-                       rpcstr_pull_unistr2_fstring(
-                                dom_name, &ref.ref_dom[dom_idx].uni_dom_name);
-                       rpcstr_pull_unistr2_fstring(
-                                name, &t_names.uni_name[i]);
-
-                       (*names)[i] = talloc_strdup(mem_ctx, name);
-                       (*domains)[i] = talloc_strdup(mem_ctx, dom_name);
-                       (*types)[i] = t_names.name[i].sid_name_use;
-                       
-                       if (((*names)[i] == NULL) || ((*domains)[i] == NULL)) {
-                               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
+                       dom_name = ref_domains->domains[dom_idx].name.string;
+                       name = lsa_names.names[i].name.string;
+
+                       if (name) {
+                               (names)[i] = talloc_strdup(mem_ctx, name);
+                               if ((names)[i] == NULL) {
+                                       DEBUG(0, ("cli_lsa_lookup_sids_noalloc(): out of memory\n"));
+                                       result = NT_STATUS_UNSUCCESSFUL;
+                                       goto done;
+                               }
+                       } else {
+                               (names)[i] = NULL;
+                       }
+                       (domains)[i] = talloc_strdup(mem_ctx, dom_name);
+                       (types)[i] = lsa_names.names[i].sid_type;
+                       if (((domains)[i] == NULL)) {
+                               DEBUG(0, ("cli_lsa_lookup_sids_noalloc(): out of memory\n"));
                                result = NT_STATUS_UNSUCCESSFUL;
                                goto done;
                        }
 
                } else {
-                       (*names)[i] = NULL;
-                       (*domains)[i] = NULL;
-                       (*types)[i] = SID_NAME_UNKNOWN;
+                       (names)[i] = NULL;
+                       (domains)[i] = NULL;
+                       (types)[i] = SID_NAME_UNKNOWN;
                }
        }
 
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
+done:
+       TALLOC_FREE(tmp_ctx);
        return result;
 }
 
-/** Lookup a list of names */
-
-NTSTATUS cli_lsa_lookup_names(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                              POLICY_HND *pol, int num_names, 
-                             const char **names, DOM_SID **sids, 
-                             uint32 **types)
+/* Lookup a list of sids
+ *
+ * do it the right way: there is a limit (of 20480 for w2k3) entries
+ * returned by this call. when the sids list contains more entries,
+ * empty lists are returned. This version of lsa_lookup_sids passes
+ * the list of sids in hunks of LOOKUP_SIDS_HUNK_SIZE to the lsa call. */
+
+/* This constant defines the limit of how many sids to look up
+ * in one call (maximum). the limit from the server side is
+ * at 20480 for win2k3, but we keep it at a save 1000 for now. */
+#define LOOKUP_SIDS_HUNK_SIZE 1000
+
+static NTSTATUS rpccli_lsa_lookup_sids_generic(struct rpc_pipe_client *cli,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct policy_handle *pol,
+                                              int num_sids,
+                                              const DOM_SID *sids,
+                                              char ***pdomains,
+                                              char ***pnames,
+                                              enum lsa_SidType **ptypes,
+                                              bool use_lookupsids3)
 {
-       prs_struct qbuf, rbuf;
-       LSA_Q_LOOKUP_NAMES q;
-       LSA_R_LOOKUP_NAMES r;
-       DOM_R_REF ref;
-       NTSTATUS result;
-       int i;
-       
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+       NTSTATUS result = NT_STATUS_OK;
+       int sids_left = 0;
+       int sids_processed = 0;
+       const DOM_SID *hunk_sids = sids;
+       char **hunk_domains;
+       char **hunk_names;
+       enum lsa_SidType *hunk_types;
+       char **domains = NULL;
+       char **names = NULL;
+       enum lsa_SidType *types = NULL;
+
+       if (num_sids) {
+               if (!(domains = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
+                       DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
 
-       /* Initialise parse structures */
+               if (!(names = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
+                       DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
 
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+               if (!(types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_sids))) {
+                       DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
+       }
 
-       /* Marshall data and send request */
+       sids_left = num_sids;
+       hunk_domains = domains;
+       hunk_names = names;
+       hunk_types = types;
+
+       while (sids_left > 0) {
+               int hunk_num_sids;
+               NTSTATUS hunk_result = NT_STATUS_OK;
+
+               hunk_num_sids = ((sids_left > LOOKUP_SIDS_HUNK_SIZE)
+                               ? LOOKUP_SIDS_HUNK_SIZE
+                               : sids_left);
+
+               DEBUG(10, ("rpccli_lsa_lookup_sids: processing items "
+                          "%d -- %d of %d.\n",
+                          sids_processed,
+                          sids_processed + hunk_num_sids - 1,
+                          num_sids));
+
+               hunk_result = rpccli_lsa_lookup_sids_noalloc(cli,
+                                                            mem_ctx,
+                                                            pol,
+                                                            hunk_num_sids,
+                                                            hunk_sids,
+                                                            hunk_domains,
+                                                            hunk_names,
+                                                            hunk_types,
+                                                            use_lookupsids3);
+
+               if (!NT_STATUS_IS_OK(hunk_result) &&
+                   !NT_STATUS_EQUAL(hunk_result, STATUS_SOME_UNMAPPED) &&
+                   !NT_STATUS_EQUAL(hunk_result, NT_STATUS_NONE_MAPPED))
+               {
+                       /* An actual error occured */
+                       result = hunk_result;
+                       goto fail;
+               }
 
-       init_q_lookup_names(mem_ctx, &q, pol, num_names, names);
+               /* adapt overall result */
+               if (( NT_STATUS_IS_OK(result) &&
+                    !NT_STATUS_IS_OK(hunk_result))
+                   ||
+                   ( NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) &&
+                    !NT_STATUS_EQUAL(hunk_result, NT_STATUS_NONE_MAPPED)))
+               {
+                       result = STATUS_SOME_UNMAPPED;
+               }
 
-       if (!lsa_io_q_lookup_names("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_LOOKUPNAMES, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
+               sids_left -= hunk_num_sids;
+               sids_processed += hunk_num_sids; /* only used in DEBUG */
+               hunk_sids += hunk_num_sids;
+               hunk_domains += hunk_num_sids;
+               hunk_names += hunk_num_sids;
+               hunk_types += hunk_num_sids;
        }
-       
-       /* Unmarshall response */
 
-       ZERO_STRUCT(ref);
-       r.dom_ref = &ref;
+       *pdomains = domains;
+       *pnames = names;
+       *ptypes = types;
+       return result;
 
-       if (!lsa_io_r_lookup_names("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
+fail:
+       TALLOC_FREE(domains);
+       TALLOC_FREE(names);
+       TALLOC_FREE(types);
+       return result;
+}
+
+NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               struct policy_handle *pol,
+                               int num_sids,
+                               const DOM_SID *sids,
+                               char ***pdomains,
+                               char ***pnames,
+                               enum lsa_SidType **ptypes)
+{
+       return rpccli_lsa_lookup_sids_generic(cli, mem_ctx, pol, num_sids, sids,
+                                             pdomains, pnames, ptypes, false);
+}
+
+NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx,
+                                struct policy_handle *pol,
+                                int num_sids,
+                                const DOM_SID *sids,
+                                char ***pdomains,
+                                char ***pnames,
+                                enum lsa_SidType **ptypes)
+{
+       return rpccli_lsa_lookup_sids_generic(cli, mem_ctx, pol, num_sids, sids,
+                                             pdomains, pnames, ptypes, true);
+}
 
-       result = r.status;
+/** Lookup a list of names */
+
+static NTSTATUS rpccli_lsa_lookup_names_generic(struct rpc_pipe_client *cli,
+                                               TALLOC_CTX *mem_ctx,
+                                               struct policy_handle *pol, int num_names,
+                                               const char **names,
+                                               const char ***dom_names,
+                                               int level,
+                                               DOM_SID **sids,
+                                               enum lsa_SidType **types,
+                                               bool use_lookupnames4)
+{
+       NTSTATUS result;
+       int i;
+       struct lsa_String *lsa_names = NULL;
+       struct lsa_RefDomainList *domains = NULL;
+       struct lsa_TransSidArray sid_array;
+       struct lsa_TransSidArray3 sid_array3;
+       uint32_t count = 0;
+
+       ZERO_STRUCT(sid_array);
+       ZERO_STRUCT(sid_array3);
+
+       lsa_names = TALLOC_ARRAY(mem_ctx, struct lsa_String, num_names);
+       if (!lsa_names) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       for (i=0; i<num_names; i++) {
+               init_lsa_String(&lsa_names[i], names[i]);
+       }
+
+       if (use_lookupnames4) {
+               result = rpccli_lsa_LookupNames4(cli, mem_ctx,
+                                                num_names,
+                                                lsa_names,
+                                                &domains,
+                                                &sid_array3,
+                                                level,
+                                                &count,
+                                                0,
+                                                0);
+       } else {
+               result = rpccli_lsa_LookupNames(cli, mem_ctx,
+                                               pol,
+                                               num_names,
+                                               lsa_names,
+                                               &domains,
+                                               &sid_array,
+                                               level,
+                                               &count);
+       }
 
        if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) !=
            NT_STATUS_V(STATUS_SOME_UNMAPPED)) {
@@ -385,1086 +460,107 @@ NTSTATUS cli_lsa_lookup_names(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        /* Return output parameters */
 
-       if (r.mapped_count == 0) {
+       if (count == 0) {
                result = NT_STATUS_NONE_MAPPED;
                goto done;
        }
 
-       if (!((*sids = TALLOC_ARRAY(mem_ctx, DOM_SID, num_names)))) {
-               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
+       if (num_names) {
+               if (!((*sids = TALLOC_ARRAY(mem_ctx, DOM_SID, num_names)))) {
+                       DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
 
-       if (!((*types = TALLOC_ARRAY(mem_ctx, uint32, num_names)))) {
-               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
+               if (!((*types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_names)))) {
+                       DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               if (dom_names != NULL) {
+                       *dom_names = TALLOC_ARRAY(mem_ctx, const char *, num_names);
+                       if (*dom_names == NULL) {
+                               DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n"));
+                               result = NT_STATUS_NO_MEMORY;
+                               goto done;
+                       }
+               }
+       } else {
+               *sids = NULL;
+               *types = NULL;
+               if (dom_names != NULL) {
+                       *dom_names = NULL;
+               }
        }
 
        for (i = 0; i < num_names; i++) {
-               DOM_RID2 *t_rids = r.dom_rid;
-               uint32 dom_idx = t_rids[i].rid_idx;
-               uint32 dom_rid = t_rids[i].rid;
+               uint32_t dom_idx;
                DOM_SID *sid = &(*sids)[i];
 
-               /* Translate optimised sid through domain index array */
-
-               if (dom_idx != 0xffffffff) {
-
-                       sid_copy(sid, &ref.ref_dom[dom_idx].ref_dom.sid);
+               if (use_lookupnames4) {
+                       dom_idx         = sid_array3.sids[i].sid_index;
+                       (*types)[i]     = sid_array3.sids[i].sid_type;
+               } else {
+                       dom_idx         = sid_array.sids[i].sid_index;
+                       (*types)[i]     = sid_array.sids[i].sid_type;
+               }
 
-                       if (dom_rid != 0xffffffff) {
-                               sid_append_rid(sid, dom_rid);
-                       }
+               /* Translate optimised sid through domain index array */
 
-                       (*types)[i] = t_rids[i].type;
-               } else {
+               if (dom_idx == 0xffffffff) {
+                       /* Nothing to do, this is unknown */
                        ZERO_STRUCTP(sid);
                        (*types)[i] = SID_NAME_UNKNOWN;
+                       continue;
                }
-       }
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Query info policy
- *
- *  @param domain_sid - returned remote server's domain sid */
-
-NTSTATUS cli_lsa_query_info_policy(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                   POLICY_HND *pol, uint16 info_class, 
-                                   char **domain_name, DOM_SID **domain_sid)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_QUERY_INFO q;
-       LSA_R_QUERY_INFO r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_q_query(&q, pol, info_class);
-
-       if (!lsa_io_q_query("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_QUERYINFOPOLICY, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_query("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       /* Return output parameters */
 
-       switch (info_class) {
-
-       case 3:
-               if (domain_name && (r.dom.id3.buffer_dom_name != 0)) {
-                       *domain_name = unistr2_tdup(mem_ctx, 
-                                                  &r.dom.id3.
-                                                  uni_domain_name);
-               }
+               if (use_lookupnames4) {
+                       sid_copy(sid, sid_array3.sids[i].sid);
+               } else {
+                       sid_copy(sid, domains->domains[dom_idx].sid);
 
-               if (domain_sid && (r.dom.id3.buffer_dom_sid != 0)) {
-                       *domain_sid = TALLOC_P(mem_ctx, DOM_SID);
-                       if (*domain_sid) {
-                               sid_copy(*domain_sid, &r.dom.id3.dom_sid.sid);
+                       if (sid_array.sids[i].rid != 0xffffffff) {
+                               sid_append_rid(sid, sid_array.sids[i].rid);
                        }
                }
 
-               break;
-
-       case 5:
-               
-               if (domain_name && (r.dom.id5.buffer_dom_name != 0)) {
-                       *domain_name = unistr2_tdup(mem_ctx, 
-                                                  &r.dom.id5.
-                                                  uni_domain_name);
+               if (dom_names == NULL) {
+                       continue;
                }
-                       
-               if (domain_sid && (r.dom.id5.buffer_dom_sid != 0)) {
-                       *domain_sid = TALLOC_P(mem_ctx, DOM_SID);
-                       if (*domain_sid) {
-                               sid_copy(*domain_sid, &r.dom.id5.dom_sid.sid);
-                       }
-               }
-               break;
-                       
-       default:
-               DEBUG(3, ("unknown info class %d\n", info_class));
-               break;                
-       }
-       
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Query info policy2
- *
- *  @param domain_name - returned remote server's domain name
- *  @param dns_name - returned remote server's dns domain name
- *  @param forest_name - returned remote server's forest name
- *  @param domain_guid - returned remote server's domain guid
- *  @param domain_sid - returned remote server's domain sid */
-
-NTSTATUS cli_lsa_query_info_policy2(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                   POLICY_HND *pol, uint16 info_class, 
-                                   char **domain_name, char **dns_name,
-                                   char **forest_name, struct uuid **domain_guid,
-                                   DOM_SID **domain_sid)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_QUERY_INFO2 q;
-       LSA_R_QUERY_INFO2 r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       if (info_class != 12)
-               goto done;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_q_query2(&q, pol, info_class);
-
-       if (!lsa_io_q_query_info2("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_QUERYINFO2, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_query_info2("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       ZERO_STRUCTP(domain_guid);
 
-       if (domain_name && r.info.dns_dom_info.hdr_nb_dom_name.buffer) {
-               *domain_name = unistr2_tdup(mem_ctx, 
-                                           &r.info.dns_dom_info
-                                           .uni_nb_dom_name);
-       }
-       if (dns_name && r.info.dns_dom_info.hdr_dns_dom_name.buffer) {
-               *dns_name = unistr2_tdup(mem_ctx, 
-                                        &r.info.dns_dom_info
-                                        .uni_dns_dom_name);
-       }
-       if (forest_name && r.info.dns_dom_info.hdr_forest_name.buffer) {
-               *forest_name = unistr2_tdup(mem_ctx, 
-                                           &r.info.dns_dom_info
-                                           .uni_forest_name);
-       }
-       
-       if (domain_guid) {
-               *domain_guid = TALLOC_P(mem_ctx, struct uuid);
-               memcpy(*domain_guid, 
-                      &r.info.dns_dom_info.dom_guid, 
-                      sizeof(struct uuid));
+               (*dom_names)[i] = domains->domains[dom_idx].name.string;
        }
 
-       if (domain_sid && r.info.dns_dom_info.ptr_dom_sid != 0) {
-               *domain_sid = TALLOC_P(mem_ctx, DOM_SID);
-               if (*domain_sid) {
-                       sid_copy(*domain_sid, 
-                                &r.info.dns_dom_info.dom_sid.sid);
-               }
-       }
-       
  done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
 
        return result;
 }
 
-/**
- * Enumerate list of trusted domains
- *
- * @param cli client state (cli_state) structure of the connection
- * @param mem_ctx memory context
- * @param pol opened lsa policy handle
- * @param enum_ctx enumeration context ie. index of first returned domain entry
- * @param pref_num_domains preferred max number of entries returned in one response
- * @param num_domains total number of trusted domains returned by response
- * @param domain_names returned trusted domain names
- * @param domain_sids returned trusted domain sids
- *
- * @return nt status code of response
- **/
-
-NTSTATUS cli_lsa_enum_trust_dom(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                POLICY_HND *pol, uint32 *enum_ctx, 
-                                uint32 *num_domains,
-                                char ***domain_names, DOM_SID **domain_sids)
+NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx,
+                                struct policy_handle *pol, int num_names,
+                                const char **names,
+                                const char ***dom_names,
+                                int level,
+                                DOM_SID **sids,
+                                enum lsa_SidType **types)
 {
-       prs_struct qbuf, rbuf;
-       LSA_Q_ENUM_TRUST_DOM q;
-       LSA_R_ENUM_TRUST_DOM r;
-       NTSTATUS result;
-       int i;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       /* 64k is enough for about 2000 trusted domains */
-        init_q_enum_trust_dom(&q, pol, *enum_ctx, 0x10000);
-
-       if (!lsa_io_q_enum_trust_dom("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_ENUMTRUSTDOM, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
+       return rpccli_lsa_lookup_names_generic(cli, mem_ctx, pol, num_names,
+                                              names, dom_names, level, sids,
+                                              types, false);
+}
 
-       if (!lsa_io_r_enum_trust_dom("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result) &&
-           !NT_STATUS_EQUAL(result, NT_STATUS_NO_MORE_ENTRIES) &&
-           !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
-
-               /* An actual error ocured */
-
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       if (r.num_domains) {
-
-               /* Allocate memory for trusted domain names and sids */
-
-               *domain_names = TALLOC_ARRAY(mem_ctx, char *, r.num_domains);
-
-               if (!*domain_names) {
-                       DEBUG(0, ("cli_lsa_enum_trust_dom(): out of memory\n"));
-                       result = NT_STATUS_NO_MEMORY;
-                       goto done;
-               }
-
-               *domain_sids = TALLOC_ARRAY(mem_ctx, DOM_SID, r.num_domains);
-               if (!domain_sids) {
-                       DEBUG(0, ("cli_lsa_enum_trust_dom(): out of memory\n"));
-                       result = NT_STATUS_NO_MEMORY;
-                       goto done;
-               }
-
-               /* Copy across names and sids */
-
-               for (i = 0; i < r.num_domains; i++) {
-                       fstring tmp;
-
-                       unistr2_to_ascii(tmp, &r.uni_domain_name[i], 
-                                        sizeof(tmp) - 1);
-                       (*domain_names)[i] = talloc_strdup(mem_ctx, tmp);
-                       sid_copy(&(*domain_sids)[i], &r.domain_sid[i].sid);
-               }
-       }
-
-       *num_domains = r.num_domains;
-       *enum_ctx = r.enum_context;
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-
-/** Enumerate privileges*/
-
-NTSTATUS cli_lsa_enum_privilege(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                POLICY_HND *pol, uint32 *enum_context, uint32 pref_max_length,
-                               uint32 *count, char ***privs_name, uint32 **privs_high, uint32 **privs_low)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_ENUM_PRIVS q;
-       LSA_R_ENUM_PRIVS r;
-       NTSTATUS result;
-       int i;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_q_enum_privs(&q, pol, *enum_context, pref_max_length);
-
-       if (!lsa_io_q_enum_privs("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_ENUM_PRIVS, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_enum_privs("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       *enum_context = r.enum_context;
-       *count = r.count;
-
-       if (!((*privs_name = TALLOC_ARRAY(mem_ctx, char *, r.count)))) {
-               DEBUG(0, ("(cli_lsa_enum_privilege): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!((*privs_high = TALLOC_ARRAY(mem_ctx, uint32, r.count)))) {
-               DEBUG(0, ("(cli_lsa_enum_privilege): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!((*privs_low = TALLOC_ARRAY(mem_ctx, uint32, r.count)))) {
-               DEBUG(0, ("(cli_lsa_enum_privilege): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       for (i = 0; i < r.count; i++) {
-               fstring name;
-
-               rpcstr_pull_unistr2_fstring( name, &r.privs[i].name);
-
-               (*privs_name)[i] = talloc_strdup(mem_ctx, name);
-
-               (*privs_high)[i] = r.privs[i].luid_high;
-               (*privs_low)[i] = r.privs[i].luid_low;
-       }
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Get privilege name */
-
-NTSTATUS cli_lsa_get_dispname(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             POLICY_HND *pol, const char *name, 
-                             uint16 lang_id, uint16 lang_id_sys,
-                             fstring description, uint16 *lang_id_desc)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_PRIV_GET_DISPNAME q;
-       LSA_R_PRIV_GET_DISPNAME r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_lsa_priv_get_dispname(&q, pol, name, lang_id, lang_id_sys);
-
-       if (!lsa_io_q_priv_get_dispname("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_PRIV_GET_DISPNAME, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_priv_get_dispname("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       /* Return output parameters */
-       
-       rpcstr_pull_unistr2_fstring(description , &r.desc);
-       *lang_id_desc = r.lang_id;
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Enumerate list of SIDs  */
-
-NTSTATUS cli_lsa_enum_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                POLICY_HND *pol, uint32 *enum_ctx, uint32 pref_max_length, 
-                                uint32 *num_sids, DOM_SID **sids)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_ENUM_ACCOUNTS q;
-       LSA_R_ENUM_ACCOUNTS r;
-       NTSTATUS result;
-       int i;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-        init_lsa_q_enum_accounts(&q, pol, *enum_ctx, pref_max_length);
-
-       if (!lsa_io_q_enum_accounts("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_ENUM_ACCOUNTS, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_enum_accounts("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       if (r.sids.num_entries==0)
-               goto done;
-
-       /* Return output parameters */
-
-       *sids = TALLOC_ARRAY(mem_ctx, DOM_SID, r.sids.num_entries);
-       if (!*sids) {
-               DEBUG(0, ("(cli_lsa_enum_sids): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Copy across names and sids */
-
-       for (i = 0; i < r.sids.num_entries; i++) {
-               sid_copy(&(*sids)[i], &r.sids.sid[i].sid);
-       }
-
-       *num_sids= r.sids.num_entries;
-       *enum_ctx = r.enum_context;
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Create a LSA user handle
- *
- * @param cli Handle on an initialised SMB connection
- *
- * FIXME: The code is actually identical to open account
- * TODO: Check and code what the function should exactly do
- *
- * */
-
-NTSTATUS cli_lsa_create_account(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             POLICY_HND *dom_pol, DOM_SID *sid, uint32 desired_access, 
-                            POLICY_HND *user_pol)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_CREATEACCOUNT q;
-       LSA_R_CREATEACCOUNT r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Initialise input parameters */
-
-       init_lsa_q_create_account(&q, dom_pol, sid, desired_access);
-
-       /* Marshall data and send request */
-
-       if (!lsa_io_q_create_account("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_CREATEACCOUNT, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_create_account("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       if (NT_STATUS_IS_OK(result = r.status)) {
-               *user_pol = r.pol;
-       }
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Open a LSA user handle
- *
- * @param cli Handle on an initialised SMB connection */
-
-NTSTATUS cli_lsa_open_account(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             POLICY_HND *dom_pol, DOM_SID *sid, uint32 des_access, 
-                            POLICY_HND *user_pol)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_OPENACCOUNT q;
-       LSA_R_OPENACCOUNT r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Initialise input parameters */
-
-       init_lsa_q_open_account(&q, dom_pol, sid, des_access);
-
-       /* Marshall data and send request */
-
-       if (!lsa_io_q_open_account("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_OPENACCOUNT, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_open_account("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       if (NT_STATUS_IS_OK(result = r.status)) {
-               *user_pol = r.pol;
-       }
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Enumerate user privileges
- *
- * @param cli Handle on an initialised SMB connection */
-
-NTSTATUS cli_lsa_enum_privsaccount(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             POLICY_HND *pol, uint32 *count, LUID_ATTR **set)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_ENUMPRIVSACCOUNT q;
-       LSA_R_ENUMPRIVSACCOUNT r;
-       NTSTATUS result;
-       int i;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Initialise input parameters */
-
-       init_lsa_q_enum_privsaccount(&q, pol);
-
-       /* Marshall data and send request */
-
-       if (!lsa_io_q_enum_privsaccount("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_ENUMPRIVSACCOUNT, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_enum_privsaccount("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       if (r.count == 0)
-               goto done;
-
-       if (!((*set = TALLOC_ARRAY(mem_ctx, LUID_ATTR, r.count)))) {
-               DEBUG(0, ("(cli_lsa_enum_privsaccount): out of memory\n"));
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       for (i=0; i<r.count; i++) {
-               (*set)[i].luid.low = r.set.set[i].luid.low;
-               (*set)[i].luid.high = r.set.set[i].luid.high;
-               (*set)[i].attr = r.set.set[i].attr;
-       }
-
-       *count=r.count;
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Get a privilege value given its name */
-
-NTSTATUS cli_lsa_lookup_priv_value(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                POLICY_HND *pol, const char *name, LUID *luid)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_LOOKUP_PRIV_VALUE q;
-       LSA_R_LOOKUP_PRIV_VALUE r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_lsa_q_lookup_priv_value(&q, pol, name);
-
-       if (!lsa_io_q_lookup_priv_value("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_LOOKUPPRIVVALUE, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_lookup_priv_value("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       (*luid).low=r.luid.low;
-       (*luid).high=r.luid.high;
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-/** Query LSA security object */
-
-NTSTATUS cli_lsa_query_secobj(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             POLICY_HND *pol, uint32 sec_info, 
-                             SEC_DESC_BUF **psdb)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_QUERY_SEC_OBJ q;
-       LSA_R_QUERY_SEC_OBJ r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-
-       init_q_query_sec_obj(&q, pol, sec_info);
-
-       if (!lsa_io_q_query_sec_obj("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_QUERYSECOBJ, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_query_sec_obj("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       if (psdb)
-               *psdb = r.buf;
-
- done:
-       prs_mem_free(&qbuf);
-       prs_mem_free(&rbuf);
-
-       return result;
-}
-
-
-/* Enumerate account rights This is similar to enum_privileges but
-   takes a SID directly, avoiding the open_account call.
-*/
-
-NTSTATUS cli_lsa_enum_account_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                    POLICY_HND *pol, DOM_SID *sid,
-                                    uint32 *count, char ***priv_names)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_ENUM_ACCT_RIGHTS q;
-       LSA_R_ENUM_ACCT_RIGHTS r;
-       NTSTATUS result;
-       int i;
-       fstring *privileges;
-       char **names;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise parse structures */
-
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-       init_q_enum_acct_rights(&q, pol, 2, sid);
-
-       if (!lsa_io_q_enum_acct_rights("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_ENUMACCTRIGHTS, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!lsa_io_r_enum_acct_rights("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       *count = r.count;
-       if (! *count) {
-               goto done;
-       }
-
-       
-       privileges = TALLOC_ARRAY(mem_ctx, fstring, *count);
-       names = TALLOC_ARRAY(mem_ctx, char *, *count);
-       for ( i=0; i<*count; i++ ) {
-               /* ensure NULL termination ... what a hack */
-               pull_ucs2(NULL, privileges[i], r.rights.strings[i].string.buffer, 
-                       sizeof(fstring), r.rights.strings[i].string.uni_str_len*2 , 0);
-                       
-               /* now copy to the return array */
-               names[i] = talloc_strdup( mem_ctx, privileges[i] );
-       }
-       
-       *priv_names = names;
-
-done:
-
-       return result;
-}
-
-
-
-/* add account rights to an account. */
-
-NTSTATUS cli_lsa_add_account_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                   POLICY_HND *pol, DOM_SID sid,
-                                   uint32 count, const char **privs_name)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_ADD_ACCT_RIGHTS q;
-       LSA_R_ADD_ACCT_RIGHTS r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-
-       /* Initialise parse structures */
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-       init_q_add_acct_rights(&q, pol, &sid, count, privs_name);
-
-       if (!lsa_io_q_add_acct_rights("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_ADDACCTRIGHTS, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_add_acct_rights("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-done:
-
-       return result;
-}
-
-
-/* remove account rights for an account. */
-
-NTSTATUS cli_lsa_remove_account_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                      POLICY_HND *pol, DOM_SID sid, BOOL removeall,
-                                      uint32 count, const char **privs_name)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_REMOVE_ACCT_RIGHTS q;
-       LSA_R_REMOVE_ACCT_RIGHTS r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-
-       /* Initialise parse structures */
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-       /* Marshall data and send request */
-       init_q_remove_acct_rights(&q, pol, &sid, removeall?1:0, count, privs_name);
-
-       if (!lsa_io_q_remove_acct_rights("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, PI_LSARPC, LSA_REMOVEACCTRIGHTS, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_remove_acct_rights("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-done:
-
-       return result;
-}
-
-
-#if 0
-
-/** An example of how to use the routines in this file.  Fetch a DOMAIN
-    sid. Does complete cli setup / teardown anonymously. */
-
-BOOL fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid)
+NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct policy_handle *pol, int num_names,
+                                 const char **names,
+                                 const char ***dom_names,
+                                 int level,
+                                 DOM_SID **sids,
+                                 enum lsa_SidType **types)
 {
-       extern pstring global_myname;
-       struct cli_state cli;
-       NTSTATUS result;
-       POLICY_HND lsa_pol;
-       BOOL ret = False;
-       ZERO_STRUCT(cli);
-       if(cli_initialise(&cli) == False) {
-               DEBUG(0,("fetch_domain_sid: unable to initialize client connection.\n"));
-               return False;
-       }
-       if(!resolve_name( remote_machine, &cli.dest_ip, 0x20)) {
-               DEBUG(0,("fetch_domain_sid: Can't resolve address for %s\n", remote_machine));
-               goto done;
-       }
-       if (!cli_connect(&cli, remote_machine, &cli.dest_ip)) {
-               DEBUG(0,("fetch_domain_sid: unable to connect to SMB server on \
-machine %s. Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
-               goto done;
-       }
-
-       if (!attempt_netbios_session_request(&cli, global_myname, remote_machine, &cli.dest_ip)) {
-               DEBUG(0,("fetch_domain_sid: machine %s rejected the NetBIOS session request.\n", 
-                       remote_machine));
-               goto done;
-       }
-       cli.protocol = PROTOCOL_NT1;
-       if (!cli_negprot(&cli)) {
-               DEBUG(0,("fetch_domain_sid: machine %s rejected the negotiate protocol. \
-Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
-               goto done;
-       }
-       if (cli.protocol != PROTOCOL_NT1) {
-               DEBUG(0,("fetch_domain_sid: machine %s didn't negotiate NT protocol.\n",
-                       remote_machine));
-               goto done;
-       }
-       /*
-        * Do an anonymous session setup.
-        */
-       if (!cli_session_setup(&cli, "", "", 0, "", 0, "")) {
-               DEBUG(0,("fetch_domain_sid: machine %s rejected the session setup. \
-Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
-               goto done;
-       }
-       if (!(cli.sec_mode & NEGOTIATE_SECURITY_USER_LEVEL)) {
-               DEBUG(0,("fetch_domain_sid: machine %s isn't in user level security mode\n",
-                       remote_machine));
-               goto done;
-       }
-
-       if (!cli_send_tconX(&cli, "IPC$", "IPC", "", 1)) {
-               DEBUG(0,("fetch_domain_sid: machine %s rejected the tconX on the IPC$ share. \
-Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
-               goto done;
-       }
-
-       /* Fetch domain sid */
-       if (!cli_nt_session_open(&cli, PI_LSARPC)) {
-               DEBUG(0, ("fetch_domain_sid: Error connecting to SAM pipe\n"));
-               goto done;
-       }
-       result = cli_lsa_open_policy(&cli, cli.mem_ctx, True, SEC_RIGHTS_QUERY_VALUE, &lsa_pol);
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0, ("fetch_domain_sid: Error opening lsa policy handle. %s\n",
-                       nt_errstr(result) ));
-               goto done;
-       }
-       result = cli_lsa_query_info_policy(&cli, cli.mem_ctx, &lsa_pol, 5, domain, psid);
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0, ("fetch_domain_sid: Error querying lsa policy handle. %s\n",
-                       nt_errstr(result) ));
-               goto done;
-       }
-       ret = True;
-
-  done:
-
-       cli_shutdown(&cli);
-       return ret;
+       return rpccli_lsa_lookup_names_generic(cli, mem_ctx, pol, num_names,
+                                              names, dom_names, level, sids,
+                                              types, true);
 }
-
-#endif
-
-/** @} **/