trying to get HEAD building again. If you want the code

[ira/wip.git] / source3 / rpc_client / cli_lsarpc.c

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 9002ad3d1b57bedc63b55ef52e6cb958cacec44e..db873236e46b49790462d679211f3e70710b4f1e 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -1164,7 +1164,7 @@ NTSTATUS cli_lsa_enum_account_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        LSA_Q_ENUM_ACCT_RIGHTS q;
        LSA_R_ENUM_ACCT_RIGHTS r;
        NTSTATUS result;
-       unsigned int i;
+       int i;
 
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
@@ -1199,7 +1199,7 @@ NTSTATUS cli_lsa_enum_account_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        *privs_name = (char **)talloc(mem_ctx, (*count) * sizeof(char **));
        for (i=0;i<*count;i++) {
-               (*privs_name)[i] = unistr2_tdup(mem_ctx, &r.rights.strings[i].string);
+               pull_ucs2_talloc(mem_ctx, &(*privs_name)[i], r.rights.strings[i].string.buffer);
        }
 
 done:
@@ -1293,58 +1293,6 @@ done:
 }
 
 
-/* list account SIDs that have the specified right */
-
-NTSTATUS cli_lsa_enum_account_with_right(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                        POLICY_HND *pol, const char *right,
-                                        uint32 *count, DOM_SID **sids)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_ENUM_ACCT_WITH_RIGHT q;
-       LSA_R_ENUM_ACCT_WITH_RIGHT 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_enum_acct_with_right(&q, pol, right);
-
-       if (!lsa_io_q_enum_acct_with_right("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, LSA_ENUMACCTWITHRIGHT, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       /* Unmarshall response */
-
-       if (!lsa_io_r_enum_acct_with_right("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       *count = r.count;
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
-       if (*count) {
-               int i;
-               (*sids) = (DOM_SID *)talloc(mem_ctx, sizeof(DOM_SID) * (*count));
-               for (i=0; i<*count; i++) {
-                       sid_copy(&(*sids)[i], &r.sids.sids[i].sid.sid);
-               }
-       }
-done:
-
-       return result;
-}
-
-
 #if 0
 
 /** An example of how to use the routines in this file.  Fetch a DOMAIN