From 009d09dcaef63ee131a5b00489b779e7e59c970c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 6 Feb 2008 13:17:50 +0100 Subject: Remove unused marshalling for SAMR_SET_ALIASINFO. Guenther (This used to be commit f56b5f976ae8a6511cbd9b73d0ec9d428da1f04d) --- source3/include/rpc_samr.h | 12 --------- source3/rpc_client/cli_samr.c | 33 ------------------------ source3/rpc_parse/parse_samr.c | 58 ------------------------------------------ 3 files changed, 103 deletions(-) diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 63f6c27c5e..f1b3cae034 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -934,18 +934,6 @@ typedef struct { } SAMR_R_QUERY_ALIASINFO; -/********************************************************/ - -typedef struct { - POLICY_HND alias_pol; /* policy handle */ - ALIAS_INFO_CTR ctr; -} SAMR_Q_SET_ALIASINFO; - -typedef struct { - NTSTATUS status; -} SAMR_R_SET_ALIASINFO; - - /********************************************************/ /* SAMR_Q_QUERY_USERGROUPS - */ diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 6a4d0dd009..16ba3cddf9 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -172,39 +172,6 @@ NTSTATUS rpccli_samr_query_usergroups(struct rpc_pipe_client *cli, return result; } -/* Set alias info */ - -NTSTATUS rpccli_samr_set_aliasinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *alias_pol, ALIAS_INFO_CTR *ctr) -{ - prs_struct qbuf, rbuf; - SAMR_Q_SET_ALIASINFO q; - SAMR_R_SET_ALIASINFO r; - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - - DEBUG(10,("cli_samr_set_aliasinfo\n")); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - - init_samr_q_set_aliasinfo(&q, alias_pol, ctr); - - CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_SET_ALIASINFO, - q, r, - qbuf, rbuf, - samr_io_q_set_aliasinfo, - samr_io_r_set_aliasinfo, - NT_STATUS_UNSUCCESSFUL); - - /* Return output parameters */ - - result = r.status; - - return result; -} - /** * Enumerate domain users * diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 751c8d76d9..26b5b1c545 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -2458,64 +2458,6 @@ bool samr_io_r_query_aliasinfo(const char *desc, SAMR_R_QUERY_ALIASINFO *out, return True; } -/******************************************************************* -inits a SAMR_Q_SET_ALIASINFO structure. -********************************************************************/ - -void init_samr_q_set_aliasinfo(SAMR_Q_SET_ALIASINFO * q_u, - POLICY_HND *hnd, ALIAS_INFO_CTR * ctr) -{ - DEBUG(5, ("init_samr_q_set_aliasinfo\n")); - - q_u->alias_pol = *hnd; - q_u->ctr = *ctr; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_q_set_aliasinfo(const char *desc, SAMR_Q_SET_ALIASINFO * q_u, - prs_struct *ps, int depth) -{ - if (q_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_q_set_aliasinfo"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth)) - return False; - if(!samr_alias_info_ctr("ctr", ps, depth, &q_u->ctr)) - return False; - - return True; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_r_set_aliasinfo(const char *desc, SAMR_R_SET_ALIASINFO * r_u, - prs_struct *ps, int depth) -{ - if (r_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_r_set_aliasinfo"); - depth++; - - if(!prs_align(ps)) - return False; - if(!prs_ntstatus("status", ps, depth, &r_u->status)) - return False; - - return True; -} - /******************************************************************* inits a SAMR_Q_LOOKUP_RIDS structure. ********************************************************************/ -- cgit