diff options
author | Günther Deschner <gd@samba.org> | 2008-02-11 18:11:11 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2008-02-11 19:16:05 +0100 |
commit | 76f654e21ce07ced6440caa71d58119b19716b34 (patch) | |
tree | d921f882a3f1cf3de5fef8ee1d7baac98c08d25e | |
parent | 7b502954002dd9b4aa413dbf334aa25d5865656e (diff) | |
download | samba-76f654e21ce07ced6440caa71d58119b19716b34.tar.gz samba-76f654e21ce07ced6440caa71d58119b19716b34.tar.bz2 samba-76f654e21ce07ced6440caa71d58119b19716b34.zip |
Remove unused marshalling for LSA_PRIV_GET_DISPNAME.
Guenther
(This used to be commit d853f4f2634a3273c193cc52e7aaa4e7234a827c)
-rw-r--r-- | source3/include/rpc_lsa.h | 21 | ||||
-rw-r--r-- | source3/rpc_client/cli_lsarpc.c | 40 | ||||
-rw-r--r-- | source3/rpc_parse/parse_lsa.c | 80 |
3 files changed, 0 insertions, 141 deletions
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h index 3dc5ea948d..9f8beae2ce 100644 --- a/source3/include/rpc_lsa.h +++ b/source3/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/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index b82d72b392..d547c3e7be 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/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/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c index 5f9fb12ab2..ded4b7a3a7 100644 --- a/source3/rpc_parse/parse_lsa.c +++ b/source3/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 */ |