diff options
author | Günther Deschner <gd@samba.org> | 2008-02-04 23:31:08 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2008-02-05 09:58:30 +0100 |
commit | 6a0897b3638413fb2980de6a6189521f2c734909 (patch) | |
tree | dc9e6447f2dd117ea65810d7622b0a8284e3e87c | |
parent | 698edf4d80214200d136e14cffbe0e8c04eeed82 (diff) | |
download | samba-6a0897b3638413fb2980de6a6189521f2c734909.tar.gz samba-6a0897b3638413fb2980de6a6189521f2c734909.tar.bz2 samba-6a0897b3638413fb2980de6a6189521f2c734909.zip |
Remove unused marshalling for SAMR_DEL_ALIASMEM.
Guenther
(This used to be commit 99d80ada6d72bea427cece3e759206eb067bc206)
-rw-r--r-- | source3/include/rpc_samr.h | 18 | ||||
-rw-r--r-- | source3/rpc_client/cli_samr.c | 31 | ||||
-rw-r--r-- | source3/rpc_parse/parse_samr.c | 59 |
3 files changed, 0 insertions, 108 deletions
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 5e3642d3dd..4cee7361b3 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -1425,24 +1425,6 @@ typedef struct r_samr_add_alias_mem_info } SAMR_R_ADD_ALIASMEM; -/* SAMR_Q_DEL_ALIASMEM - add an add alias member */ -typedef struct q_samr_del_alias_mem_info -{ - POLICY_HND alias_pol; /* policy handle */ - - DOM_SID2 sid; /* member sid to be added to alias */ - -} SAMR_Q_DEL_ALIASMEM; - - -/* SAMR_R_DEL_ALIASMEM - delete alias member */ -typedef struct r_samr_del_alias_mem_info -{ - NTSTATUS status; /* return status */ - -} SAMR_R_DEL_ALIASMEM; - - /* SAMR_ENC_PASSWD */ typedef struct enc_passwd_info { diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index a35b5dc6a3..a1824a4803 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -605,37 +605,6 @@ NTSTATUS rpccli_samr_add_aliasmem(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c return result; } -/* Delete an alias member */ - -NTSTATUS rpccli_samr_del_aliasmem(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *alias_pol, DOM_SID *member) -{ - prs_struct qbuf, rbuf; - SAMR_Q_DEL_ALIASMEM q; - SAMR_R_DEL_ALIASMEM r; - NTSTATUS result; - - DEBUG(10,("cli_samr_del_aliasmem")); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - - init_samr_q_del_aliasmem(&q, alias_pol, member); - - CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_DEL_ALIASMEM, - q, r, - qbuf, rbuf, - samr_io_q_del_aliasmem, - samr_io_r_del_aliasmem, - NT_STATUS_UNSUCCESSFUL); - - result = r.status; - - return result; -} - /* Query alias info */ NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 4e41d2986b..aafb49e2ec 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -3658,65 +3658,6 @@ bool samr_io_r_add_aliasmem(const char *desc, SAMR_R_ADD_ALIASMEM * r_u, } /******************************************************************* -inits a SAMR_Q_DEL_ALIASMEM structure. -********************************************************************/ - -void init_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM * q_u, POLICY_HND *hnd, - DOM_SID *sid) -{ - DEBUG(5, ("init_samr_q_del_aliasmem\n")); - - q_u->alias_pol = *hnd; - init_dom_sid2(&q_u->sid, sid); -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_q_del_aliasmem(const char *desc, SAMR_Q_DEL_ALIASMEM * q_u, - prs_struct *ps, int depth) -{ - if (q_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_q_del_aliasmem"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth)) - return False; - if(!smb_io_dom_sid2("sid ", &q_u->sid, ps, depth)) - return False; - - return True; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_r_del_aliasmem(const char *desc, SAMR_R_DEL_ALIASMEM * r_u, - prs_struct *ps, int depth) -{ - if (r_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_r_del_aliasmem"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!prs_ntstatus("status", ps, depth, &r_u->status)) - return False; - - return True; -} - -/******************************************************************* inits a SAMR_Q_QUERY_ALIASMEM structure. ********************************************************************/ |