diff options
author | Günther Deschner <gd@samba.org> | 2008-02-01 11:39:49 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2008-02-01 12:30:07 +0100 |
commit | e8c794fabee9aa19183447a915ea9a0d2cc9fda8 (patch) | |
tree | d7c3a405e7b697a5cc776672ee6d79ffff21c131 | |
parent | 2c7428e64ed69a2aaba80d3ef9d9cefde44fec0b (diff) | |
download | samba-e8c794fabee9aa19183447a915ea9a0d2cc9fda8.tar.gz samba-e8c794fabee9aa19183447a915ea9a0d2cc9fda8.tar.bz2 samba-e8c794fabee9aa19183447a915ea9a0d2cc9fda8.zip |
Remove unused marshalling for SAMR_OPEN_ALIAS.
Guenther
(This used to be commit c00d629d4e557e5efd7c339904e228ca76504e7a)
-rw-r--r-- | source3/include/rpc_samr.h | 21 | ||||
-rw-r--r-- | source3/rpc_client/cli_samr.c | 40 | ||||
-rw-r--r-- | source3/rpc_parse/parse_samr.c | 66 |
3 files changed, 0 insertions, 127 deletions
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index d891c7c5ea..6b523ea43d 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -1618,27 +1618,6 @@ typedef struct r_samr_del_alias_mem_info } SAMR_R_DEL_ALIASMEM; - -/* SAMR_Q_OPEN_ALIAS - probably an open */ -typedef struct q_samr_open_alias_info -{ - POLICY_HND dom_pol; - - uint32 access_mask; - uint32 rid_alias; - -} SAMR_Q_OPEN_ALIAS; - - -/* SAMR_R_OPEN_ALIAS - probably an open */ -typedef struct r_samr_open_alias_info -{ - POLICY_HND pol; /* policy handle */ - NTSTATUS status; /* return status */ - -} SAMR_R_OPEN_ALIAS; - - /* SAMR_Q_CONNECT_ANON - probably an open */ typedef struct q_samr_connect_anon_info { uint32 ptr; /* ptr? */ diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 26f5a66ecf..5e2f77e09d 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -789,46 +789,6 @@ NTSTATUS rpccli_samr_query_aliasmem(struct rpc_pipe_client *cli, return result; } -/* Open handle on an alias */ - -NTSTATUS rpccli_samr_open_alias(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - POLICY_HND *domain_pol, uint32 access_mask, - uint32 alias_rid, POLICY_HND *alias_pol) -{ - prs_struct qbuf, rbuf; - SAMR_Q_OPEN_ALIAS q; - SAMR_R_OPEN_ALIAS r; - NTSTATUS result; - - DEBUG(10,("cli_samr_open_alias with rid 0x%x\n", alias_rid)); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - - init_samr_q_open_alias(&q, domain_pol, access_mask, alias_rid); - - CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_OPEN_ALIAS, - q, r, - qbuf, rbuf, - samr_io_q_open_alias, - samr_io_r_open_alias, - NT_STATUS_UNSUCCESSFUL); - - /* Return output parameters */ - - if (NT_STATUS_IS_OK(result = r.status)) { - *alias_pol = r.pol; -#ifdef __INSURE__ - alias_pol->marker = malloc(1); -#endif - } - - return result; -} - /* Create an alias */ NTSTATUS rpccli_samr_create_dom_alias(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 4927feb682..3acea823a0 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -3844,72 +3844,6 @@ bool samr_io_r_query_useraliases(const char *desc, SAMR_R_QUERY_USERALIASES * r_ } /******************************************************************* -inits a SAMR_Q_OPEN_ALIAS structure. -********************************************************************/ - -void init_samr_q_open_alias(SAMR_Q_OPEN_ALIAS * q_u, POLICY_HND *pol, - uint32 access_mask, uint32 rid) -{ - DEBUG(5, ("init_samr_q_open_alias\n")); - - q_u->dom_pol = *pol; - q_u->access_mask = access_mask; - q_u->rid_alias = rid; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_q_open_alias(const char *desc, SAMR_Q_OPEN_ALIAS * q_u, - prs_struct *ps, int depth) -{ - if (q_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_q_open_alias"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!smb_io_pol_hnd("domain_pol", &q_u->dom_pol, ps, depth)) - return False; - - if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask)) - return False; - if(!prs_uint32("rid_alias", ps, depth, &q_u->rid_alias)) - return False; - - return True; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_r_open_alias(const char *desc, SAMR_R_OPEN_ALIAS * r_u, - prs_struct *ps, int depth) -{ - if (r_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_r_open_alias"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth)) - return False; - - if(!prs_ntstatus("status", ps, depth, &r_u->status)) - return False; - - return True; -} - -/******************************************************************* inits a SAMR_Q_LOOKUP_RIDS structure. ********************************************************************/ |