Remove unused marshalling for LSA_PRIV_GET_DISPNAME.

Guenther

diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index 3dc5ea948dca61deb1d91594b27775b06ca3565d..9f8beae2cef9451387f6de27edb7b8f34de780e5 100644 (file)
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -535,27 +535,6 @@ typedef struct
 } LSA_R_REMOVE_ACCT_RIGHTS;
 
 
-/* LSA_Q_PRIV_GET_DISPNAME - LSA get privilege display name */
-typedef struct lsa_q_priv_get_dispname
-{
-       POLICY_HND pol; /* policy handle */
-       UNIHDR hdr_name;
-       UNISTR2 name;
-       uint16 lang_id;
-       uint16 lang_id_sys;
-} LSA_Q_PRIV_GET_DISPNAME;
-
-typedef struct lsa_r_priv_get_dispname
-{
-       uint32 ptr_info;
-       UNIHDR hdr_desc;
-       UNISTR2 desc;
-       /* Don't align ! */
-       uint16 lang_id;
-       /* align */
-       NTSTATUS status;
-} LSA_R_PRIV_GET_DISPNAME;
-
 /* LSA_Q_ENUM_ACCOUNTS */
 typedef struct lsa_q_enum_accounts
 {

diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index b82d72b392b0950b8ac90b19a8fcb405b811487a..d547c3e7be1b0ad468068e4de14052dee4e8748b 100644 (file)
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -537,46 +537,6 @@ NTSTATUS rpccli_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
        return out.status;
 }
 
-/** Get privilege name */
-
-NTSTATUS rpccli_lsa_get_dispname(struct rpc_pipe_client *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);
-
-       init_lsa_priv_get_dispname(&q, pol, name, lang_id, lang_id_sys);
-
-       CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_PRIV_GET_DISPNAME,
-               q, r,
-               qbuf, rbuf,
-               lsa_io_q_priv_get_dispname,
-               lsa_io_r_priv_get_dispname,
-               NT_STATUS_UNSUCCESSFUL);
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-
-       /* Return output parameters */
-
-       rpcstr_pull_unistr2_fstring(description , &r.desc);
-       *lang_id_desc = r.lang_id;
-
- done:
-
-       return result;
-}
-
 /** Enumerate list of SIDs  */
 
 NTSTATUS rpccli_lsa_enum_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,

diff --git a/source/rpc_parse/parse_lsa.c b/source/rpc_parse/parse_lsa.c
index 5f9fb12ab256c16b316d5a74b02c282a3ddbe86c..ded4b7a3a70698fd2eb8d7db269639a88f3b9115 100644 (file)
--- a/source/rpc_parse/parse_lsa.c
+++ b/source/rpc_parse/parse_lsa.c
@@ -1412,86 +1412,6 @@ bool lsa_io_r_lookup_names4(const char *desc, LSA_R_LOOKUP_NAMES4 *out, prs_stru
        return True;
 }
 
-void init_lsa_priv_get_dispname(LSA_Q_PRIV_GET_DISPNAME *trn, POLICY_HND *hnd, const char *name, uint16 lang_id, uint16 lang_id_sys)
-{
-       memcpy(&trn->pol, hnd, sizeof(trn->pol));
-
-       init_unistr2(&trn->name, name, UNI_FLAGS_NONE);
-       init_uni_hdr(&trn->hdr_name, &trn->name);
-       trn->lang_id = lang_id;
-       trn->lang_id_sys = lang_id_sys;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-bool lsa_io_q_priv_get_dispname(const char *desc, LSA_Q_PRIV_GET_DISPNAME *in, prs_struct *ps, int depth)
-{
-       if (in == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "lsa_io_q_priv_get_dispname");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if (!smb_io_pol_hnd("", &in->pol, ps, depth))
-               return False;
-
-       if (!smb_io_unihdr("hdr_name", &in->hdr_name, ps, depth))
-               return False;
-
-       if (!smb_io_unistr2("name", &in->name, in->hdr_name.buffer, ps, depth))
-               return False;
-
-       if(!prs_uint16("lang_id    ", ps, depth, &in->lang_id))
-               return False;
-       if(!prs_uint16("lang_id_sys", ps, depth, &in->lang_id_sys))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-bool lsa_io_r_priv_get_dispname(const char *desc, LSA_R_PRIV_GET_DISPNAME *out, prs_struct *ps, int depth)
-{
-       if (out == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "lsa_io_r_priv_get_dispname");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if (!prs_uint32("ptr_info", ps, depth, &out->ptr_info))
-               return False;
-
-       if (out->ptr_info){
-               if (!smb_io_unihdr("hdr_name", &out->hdr_desc, ps, depth))
-                       return False;
-
-               if (!smb_io_unistr2("desc", &out->desc, out->hdr_desc.buffer, ps, depth))
-                       return False;
-       }
-/*
-       if(!prs_align(ps))
-               return False;
-*/
-       if(!prs_uint16("lang_id", ps, depth, &out->lang_id))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_ntstatus("status", ps, depth, &out->status))
-               return False;
-
-       return True;
-}
-
 /*
   initialise a LSA_Q_ENUM_ACCOUNTS structure
 */