From 331c1ad49b02a00541cc73cb6b6ccc6fc6a9c7d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Fri, 1 Feb 2008 12:21:15 +0100
Subject: [PATCH] Remove unused marshalling for SAMR_OPEN_GROUP.

Guenther
(This used to be commit 9660a341b6b32609b28770130e974d674ab31215)
---
 source3/include/rpc_samr.h     | 19 ----------
 source3/rpc_client/cli_samr.c  | 40 --------------------
 source3/rpc_parse/parse_samr.c | 67 ----------------------------------
 3 files changed, 126 deletions(-)

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 69639679fb5..d891c7c5eaa 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -1560,25 +1560,6 @@ typedef struct r_samr_add_group_mem_info
 } SAMR_R_ADD_GROUPMEM;
 
 
-/* SAMR_Q_OPEN_GROUP - probably an open */
-typedef struct q_samr_open_group_info
-{
-	POLICY_HND domain_pol;       /* policy handle */
-	uint32 access_mask;         /* 0x0000 0001, 0x0000 0003, 0x0000 001f */
-	uint32 rid_group;        /* rid */
-
-} SAMR_Q_OPEN_GROUP;
-
-
-/* SAMR_R_OPEN_GROUP - probably an open */
-typedef struct r_samr_open_group_info
-{
-	POLICY_HND pol;       /* policy handle */
-	NTSTATUS status;         /* return status */
-
-} SAMR_R_OPEN_GROUP;
-
-
 /* SAMR_Q_QUERY_ALIASMEM - query alias members */
 typedef struct q_samr_query_aliasmem_info
 {
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index b5d2e4a7001..26f5a66ecfc 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -133,46 +133,6 @@ NTSTATUS rpccli_samr_open_user(struct rpc_pipe_client *cli,
 	return result;
 }
 
-/* Open handle on a group */
-
-NTSTATUS rpccli_samr_open_group(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx, 
-				POLICY_HND *domain_pol, uint32 access_mask, 
-				uint32 group_rid, POLICY_HND *group_pol)
-{
-	prs_struct qbuf, rbuf;
-	SAMR_Q_OPEN_GROUP q;
-	SAMR_R_OPEN_GROUP r;
-	NTSTATUS result =  NT_STATUS_UNSUCCESSFUL;
-
-	DEBUG(10,("cli_samr_open_group with rid 0x%x\n", group_rid ));
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Marshall data and send request */
-
-	init_samr_q_open_group(&q, domain_pol, access_mask, group_rid);
-
-	CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_OPEN_GROUP,
-		q, r,
-		qbuf, rbuf,
-		samr_io_q_open_group,
-		samr_io_r_open_group,
-		NT_STATUS_UNSUCCESSFUL); 
-
-	/* Return output parameters */
-
-	if (NT_STATUS_IS_OK(result = r.status)) {
-		*group_pol = r.pol;
-#ifdef __INSURE__
-		group_pol->marker = malloc(1);
-#endif
-	}
-
-	return result;
-}
-
 /* Create domain group */
 
 NTSTATUS rpccli_samr_create_dom_group(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 f52794ea506..4927feb6829 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -2048,73 +2048,6 @@ bool samr_io_r_query_dispinfo(const char *desc, SAMR_R_QUERY_DISPINFO * r_u,
 	return True;
 }
 
-/*******************************************************************
-inits a SAMR_Q_OPEN_GROUP structure.
-********************************************************************/
-
-void init_samr_q_open_group(SAMR_Q_OPEN_GROUP * q_c,
-			    POLICY_HND *hnd,
-			    uint32 access_mask, uint32 rid)
-{
-	DEBUG(5, ("init_samr_q_open_group\n"));
-
-	q_c->domain_pol = *hnd;
-	q_c->access_mask = access_mask;
-	q_c->rid_group = rid;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_open_group(const char *desc, SAMR_Q_OPEN_GROUP * q_u,
-			  prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_open_group");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
-		return False;
-
-	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
-		return False;
-	if(!prs_uint32("rid_group", ps, depth, &q_u->rid_group))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_open_group(const char *desc, SAMR_R_OPEN_GROUP * r_u,
-			  prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_open_group");
-	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 GROUP_INFO1 structure.
 ********************************************************************/