Remove unused marshalling for LSA_ADD_ACCT_RIGHTS.

Guenther
(This used to be commit 15b97d1aafd6c8ad936944b611188154b191167f)

diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index e7e013f8aa63a1a4b1e031815a46a3925eb18631..1b82342cfcb58241efaeb5b7c81f0aa8fdc3f18a 100644 (file)
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -462,22 +462,6 @@ typedef struct
 } LSA_R_ENUM_ACCT_RIGHTS;
 
 
-/* LSA_Q_ADD_ACCT_RIGHTS - LSA add account rights */
-typedef struct
-{
-       POLICY_HND pol; /* policy handle */
-       DOM_SID2 sid;
-       uint32 count;
-       UNISTR4_ARRAY *rights;
-} LSA_Q_ADD_ACCT_RIGHTS;
-
-/* LSA_R_ADD_ACCT_RIGHTS - LSA add account rights */
-typedef struct
-{
-       NTSTATUS status;
-} LSA_R_ADD_ACCT_RIGHTS;
-
-
 /* LSA_Q_REMOVE_ACCT_RIGHTS - LSA remove account rights */
 typedef struct
 {

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 9d9a131a1ab04770b7cfac34b8747593e81dad9d..1395aa66324c91b3b37d5458ec103410a4296009 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -522,42 +522,6 @@ done:
 }
 
 
-
-/* add account rights to an account. */
-
-NTSTATUS rpccli_lsa_add_account_rights(struct rpc_pipe_client *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);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-       init_q_add_acct_rights(&q, pol, &sid, count, privs_name);
-
-       CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_ADDACCTRIGHTS,
-               q, r,
-               qbuf, rbuf,
-               lsa_io_q_add_acct_rights,
-               lsa_io_r_add_acct_rights,
-               NT_STATUS_UNSUCCESSFUL);
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-done:
-
-       return result;
-}
-
-
 /* remove account rights for an account. */
 
 NTSTATUS rpccli_lsa_remove_account_rights(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,

diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index d4d32531a06305ac5b70eed030c4cad0336bab5c..05841e59a7cc5487f932daa14bc3f457c67b42d4 100644 (file)
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -1311,65 +1311,6 @@ bool lsa_io_r_enum_acct_rights(const char *desc, LSA_R_ENUM_ACCT_RIGHTS *out, pr
 }
 
 
-/*******************************************************************
- Inits an LSA_Q_ADD_ACCT_RIGHTS structure.
-********************************************************************/
-void init_q_add_acct_rights( LSA_Q_ADD_ACCT_RIGHTS *in, POLICY_HND *hnd, 
-                             DOM_SID *sid, uint32 count, const char **rights )
-{
-       DEBUG(5, ("init_q_add_acct_rights\n"));
-
-       in->pol = *hnd;
-       init_dom_sid2(&in->sid, sid);
-       
-       in->rights = TALLOC_P( talloc_tos(), UNISTR4_ARRAY );
-       if (!in->rights) {
-               smb_panic("init_q_add_acct_rights: talloc fail\n");
-               return;
-       }
-       init_unistr4_array( in->rights, count, rights );
-       
-       in->count = count;
-}
-
-
-/*******************************************************************
-reads or writes a LSA_Q_ADD_ACCT_RIGHTS structure.
-********************************************************************/
-bool lsa_io_q_add_acct_rights(const char *desc, LSA_Q_ADD_ACCT_RIGHTS *in, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "lsa_io_q_add_acct_rights");
-       depth++;
-
-       if (!smb_io_pol_hnd("", &in->pol, ps, depth))
-               return False;
-
-       if(!smb_io_dom_sid2("sid", &in->sid, ps, depth))
-               return False;
-
-       if(!prs_uint32("count", ps, depth, &in->count))
-               return False;
-
-       if ( !prs_pointer("rights", ps, depth, (void*)&in->rights, sizeof(UNISTR4_ARRAY), (PRS_POINTER_CAST)prs_unistr4_array) )
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes a LSA_R_ENUM_ACCT_RIGHTS structure.
-********************************************************************/
-bool lsa_io_r_add_acct_rights(const char *desc, LSA_R_ADD_ACCT_RIGHTS *out, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "lsa_io_r_add_acct_rights");
-       depth++;
-
-       if(!prs_ntstatus("status", ps, depth, &out->status))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
  Inits an LSA_Q_REMOVE_ACCT_RIGHTS structure.
 ********************************************************************/