Remove unused marshalling for SAMR_QUERY_ALIASMEM.

Guenther
(This used to be commit 1b1f9ee2e931a9c2608e4fd4bc37b877c52b1dcb)

3 files changed, 0 insertions, 208 deletions

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 57c78316eb..e9c9efd899 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -1385,28 +1385,6 @@ typedef struct r_samr_query_groupmem_info
 } SAMR_R_QUERY_GROUPMEM;
 
 
-/* SAMR_Q_QUERY_ALIASMEM - query alias members */
-typedef struct q_samr_query_aliasmem_info
-{
-	POLICY_HND alias_pol;        /* policy handle */
-
-} SAMR_Q_QUERY_ALIASMEM;
-
-
-/* SAMR_R_QUERY_ALIASMEM - query alias members */
-typedef struct r_samr_query_aliasmem_info
-{
-	uint32 num_sids;
-	uint32 ptr;
-	uint32 num_sids1;
-
-	DOM_SID2 *sid;
-
-	NTSTATUS status;
-
-} SAMR_R_QUERY_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 4f29397c1a..8b4ad1e7e4 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -518,62 +518,6 @@ NTSTATUS rpccli_samr_enum_als_groups(struct rpc_pipe_client *cli,
 	return result;
 }
 
-/* Query alias members */
-
-NTSTATUS rpccli_samr_query_aliasmem(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx,
-				    POLICY_HND *alias_pol, uint32 *num_mem, 
-				    DOM_SID **sids)
-{
-	prs_struct qbuf, rbuf;
-	SAMR_Q_QUERY_ALIASMEM q;
-	SAMR_R_QUERY_ALIASMEM r;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-	uint32 i;
-
-	DEBUG(10,("cli_samr_query_aliasmem\n"));
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Marshall data and send request */
-
-	init_samr_q_query_aliasmem(&q, alias_pol);
-
-	CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_ALIASMEM,
-		q, r,
-		qbuf, rbuf,
-		samr_io_q_query_aliasmem,
-		samr_io_r_query_aliasmem,
-		NT_STATUS_UNSUCCESSFUL); 
-
-	/* Return output parameters */
-
-	if (!NT_STATUS_IS_OK(result = r.status)) {
-		goto done;
-	}
-
-	*num_mem = r.num_sids;
-
-	if (*num_mem == 0) {
-		*sids = NULL;
-		result = NT_STATUS_OK;
-		goto done;
-	}
-
-	if (!(*sids = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_mem))) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	for (i = 0; i < *num_mem; i++) {
-		(*sids)[i] = r.sid[i].sid;
-	}
-
- done:
-	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 fb3994a1d2..1dc1ff0859 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -3599,136 +3599,6 @@ bool samr_io_r_lookup_rids(const char *desc, SAMR_R_LOOKUP_RIDS * r_u,
 }
 
 /*******************************************************************
-inits a SAMR_Q_QUERY_ALIASMEM structure.
-********************************************************************/
-
-void init_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM * q_c,
-				POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_query_aliasmem\n"));
-
-	q_c->alias_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_query_aliasmem(const char *desc, SAMR_Q_QUERY_ALIASMEM * q_u,
-			      prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_query_aliasmem");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-inits a SAMR_R_QUERY_ALIASMEM structure.
-********************************************************************/
-
-void init_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM * r_u,
-				uint32 num_sids, DOM_SID2 * sid,
-				NTSTATUS status)
-{
-	DEBUG(5, ("init_samr_r_query_aliasmem\n"));
-
-	if (NT_STATUS_IS_OK(status)) {
-		r_u->num_sids = num_sids;
-		r_u->ptr = (num_sids != 0) ? 1 : 0;
-		r_u->num_sids1 = num_sids;
-
-		r_u->sid = sid;
-	} else {
-		r_u->ptr = 0;
-		r_u->num_sids = 0;
-	}
-
-	r_u->status = status;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
-			      prs_struct *ps, int depth)
-{
-	uint32 i;
-
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_query_aliasmem");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("num_sids ", ps, depth, &r_u->num_sids))
-		return False;
-	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
-		return False;
-
-	if (r_u->ptr != 0 && r_u->num_sids != 0) {
-		uint32 *ptr_sid = NULL;
-
-		if(!prs_uint32("num_sids1", ps, depth, &r_u->num_sids1))
-			return False;
-
-		/* We must always use talloc here even when marshalling. */
-		if (r_u->num_sids1) {
-			ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
-			if (!ptr_sid) {
-				return False;
-			}
-		} else {
-			ptr_sid = NULL;
-		}
-		
-		for (i = 0; i < r_u->num_sids1; i++) {
-			ptr_sid[i] = 1;
-			if(!prs_uint32("ptr_sid", ps, depth, &ptr_sid[i]))
-				return False;
-		}
-		
-		if (UNMARSHALLING(ps)) {
-			if (r_u->num_sids1) {
-				r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
-				if (!r_u->sid) {
-					return False;
-				}
-			} else {
-				r_u->sid = NULL;
-			}
-		}
-		
-		for (i = 0; i < r_u->num_sids1; i++) {
-			if (ptr_sid[i] != 0) {
-				if(!smb_io_dom_sid2("sid", &r_u->sid[i], ps, depth))
-					return False;
-			}
-		}
-	}
-
-	if(!prs_align(ps))
-		return False;
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
 inits a SAMR_Q_LOOKUP_NAMES structure.
 ********************************************************************/