Remove unused marshalling for LSA_REMOVE_ACCT_RIGHTS.

Guenther
(This used to be commit 80e39330bf15cc57f2780a5b900d8a2b14d92fa9)

diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 0cfee2da61d68771757ddd5933ab56889fa615a4..dde014a4cc1806d77ff7205f02170a30d5f472f4 100644 (file)
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -446,20 +446,4 @@ typedef struct lsa_r_lookup_names4
        NTSTATUS status; /* return code */
 } LSA_R_LOOKUP_NAMES4;
 
-/* LSA_Q_REMOVE_ACCT_RIGHTS - LSA remove account rights */
-typedef struct
-{
-       POLICY_HND pol; /* policy handle */
-       DOM_SID2 sid;
-       uint32 removeall;
-       uint32 count;
-       UNISTR4_ARRAY *rights;
-} LSA_Q_REMOVE_ACCT_RIGHTS;
-
-/* LSA_R_REMOVE_ACCT_RIGHTS - LSA remove account rights */
-typedef struct
-{
-       NTSTATUS status;
-} LSA_R_REMOVE_ACCT_RIGHTS;
-
 #endif /* _RPC_LSA_H */

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 1de95920de092eac7b0e330cc5875763fc3f4379..a4c5331008ca293b95648cb965d34d0af603ef1f 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -452,41 +452,6 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli,
        return result;
 }
 
-/* remove account rights for an account. */
-
-NTSTATUS rpccli_lsa_remove_account_rights(struct rpc_pipe_client *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);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-       init_q_remove_acct_rights(&q, pol, &sid, removeall?1:0, count, privs_name);
-
-       CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_REMOVEACCTRIGHTS,
-               q, r,
-               qbuf, rbuf,
-               lsa_io_q_remove_acct_rights,
-               lsa_io_r_remove_acct_rights,
-               NT_STATUS_UNSUCCESSFUL);
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-done:
-
-       return result;
-}
-
-
 #if 0
 
 /** An example of how to use the routines in this file.  Fetch a DOMAIN

diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index 1a5c5e8a3e7c087a45347d7b968eafec9ba732f9..80e90a82657af95ceaf3abe83506e658b0296de5 100644 (file)
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -1218,72 +1218,3 @@ bool policy_handle_is_valid(const POLICY_HND *hnd)
        ZERO_STRUCT(zero_pol);
        return ((memcmp(&zero_pol, hnd, sizeof(POLICY_HND)) == 0) ? False : True );
 }
-
-/*******************************************************************
- Inits an LSA_Q_REMOVE_ACCT_RIGHTS structure.
-********************************************************************/
-
-void init_q_remove_acct_rights(LSA_Q_REMOVE_ACCT_RIGHTS *in, 
-                              POLICY_HND *hnd, 
-                              DOM_SID *sid,
-                              uint32 removeall,
-                              uint32 count, 
-                              const char **rights)
-{
-       DEBUG(5, ("init_q_remove_acct_rights\n"));
-
-       in->pol = *hnd;
-
-       init_dom_sid2(&in->sid, sid);
-
-       in->removeall = removeall;
-       in->count = count;
-
-       in->rights = TALLOC_P( talloc_tos(), UNISTR4_ARRAY );
-       if (!in->rights) {
-               smb_panic("init_q_remove_acct_rights: talloc fail\n");
-               return;
-       }
-       init_unistr4_array( in->rights, count, rights );
-}
-
-/*******************************************************************
-reads or writes a LSA_Q_REMOVE_ACCT_RIGHTS structure.
-********************************************************************/
-
-bool lsa_io_q_remove_acct_rights(const char *desc, LSA_Q_REMOVE_ACCT_RIGHTS *in, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "lsa_io_q_remove_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("removeall", ps, depth, &in->removeall))
-               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_remove_acct_rights(const char *desc, LSA_R_REMOVE_ACCT_RIGHTS *out, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "lsa_io_r_remove_acct_rights");
-       depth++;
-
-       if(!prs_ntstatus("status", ps, depth, &out->status))
-               return False;
-
-       return True;
-}