Remove unused marshalling for SAMR_QUERY_DOMAIN_INFO2.

Guenther
(This used to be commit d4dc2781add71712705f4f244e8896683b701e77)

3 files changed, 0 insertions, 207 deletions

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 6c0639bf375..1b95b23ad32 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -1380,24 +1380,6 @@ typedef struct sid_info_3
 
 } DOM_SID3;
 
-/* SAMR_Q_QUERY_DOMAIN_INFO2 */
-typedef struct q_samr_query_domain_info2
-{
-	POLICY_HND domain_pol;   /* policy handle */
-	uint16 switch_value;
-
-} SAMR_Q_QUERY_DOMAIN_INFO2;
-
-/* SAMR_R_QUERY_DOMAIN_INFO2 */
-typedef struct r_samr_query_domain_info2
-{
-	uint32 ptr_0;
-	uint16 switch_value;
-	SAM_UNK_CTR *ctr;
-	NTSTATUS status;         /* return status */
-
-} SAMR_R_QUERY_DOMAIN_INFO2;
-
 /* SAMR_Q_SET_DOMAIN_INFO */
 typedef struct q_samr_set_domain_info
 {
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 21e44e014be..d9427e3e4cf 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -509,48 +509,6 @@ NTSTATUS rpccli_samr_query_dom_info(struct rpc_pipe_client *cli,
 	return result;
 }
 
-/* Query domain info2 */
-
-NTSTATUS rpccli_samr_query_dom_info2(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx, 
-				     POLICY_HND *domain_pol,
-				     uint16 switch_value,
-				     SAM_UNK_CTR *ctr)
-{
-	prs_struct qbuf, rbuf;
-	SAMR_Q_QUERY_DOMAIN_INFO2 q;
-	SAMR_R_QUERY_DOMAIN_INFO2 r;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-	DEBUG(10,("cli_samr_query_dom_info2\n"));
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Marshall data and send request */
-
-	init_samr_q_query_domain_info2(&q, domain_pol, switch_value);
-
-	r.ctr = ctr;
-
-	CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_DOMAIN_INFO2,
-		q, r,
-		qbuf, rbuf,
-		samr_io_q_query_domain_info2,
-		samr_io_r_query_domain_info2,
-		NT_STATUS_UNSUCCESSFUL); 
-
-	/* Return output parameters */
-
-	if (!NT_STATUS_IS_OK(result = r.status)) {
-		goto done;
-	}
-
- done:
-
-	return result;
-}
-
 /* Set domain info */
 
 NTSTATUS rpccli_samr_set_domain_info(struct rpc_pipe_client *cli,
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index da7f04a4ffe..9947f58736d 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -5652,153 +5652,6 @@ bool samr_io_r_chgpasswd_user3(const char *desc, SAMR_R_CHGPASSWD_USER3 *r_u,
 reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_query_domain_info2(SAMR_Q_QUERY_DOMAIN_INFO2 *q_u,
-				POLICY_HND *domain_pol, uint16 switch_value)
-{
-	DEBUG(5, ("init_samr_q_query_domain_info2\n"));
-
-	q_u->domain_pol = *domain_pol;
-	q_u->switch_value = switch_value;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_query_domain_info2(const char *desc, SAMR_Q_QUERY_DOMAIN_INFO2 *q_u,
-			      prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_query_domain_info2");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
-		return False;
-
-	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-inits a SAMR_R_QUERY_DOMAIN_INFO structure.
-********************************************************************/
-
-void init_samr_r_query_domain_info2(SAMR_R_QUERY_DOMAIN_INFO2 * r_u,
-				    uint16 switch_value, SAM_UNK_CTR * ctr,
-				    NTSTATUS status)
-{
-	DEBUG(5, ("init_samr_r_query_domain_info2\n"));
-
-	r_u->ptr_0 = 0;
-	r_u->switch_value = 0;
-	r_u->status = status;	/* return status */
-
-	if (NT_STATUS_IS_OK(status)) {
-		r_u->switch_value = switch_value;
-		r_u->ptr_0 = 1;
-		r_u->ctr = ctr;
-	}
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_query_domain_info2(const char *desc, SAMR_R_QUERY_DOMAIN_INFO2 * r_u,
-				  prs_struct *ps, int depth)
-{
-        if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_query_domain_info2");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("ptr_0 ", ps, depth, &r_u->ptr_0))
-		return False;
-
-	if (r_u->ptr_0 != 0 && r_u->ctr != NULL) {
-		if(!prs_uint16("switch_value", ps, depth, &r_u->switch_value))
-			return False;
-		if(!prs_align(ps))
-			return False;
-
-		switch (r_u->switch_value) {
-		case 0x0d:
-			if(!sam_io_unk_info13("unk_inf13", &r_u->ctr->info.inf13, ps, depth))
-				return False;
-			break;
-		case 0x0c:
-			if(!sam_io_unk_info12("unk_inf12", &r_u->ctr->info.inf12, ps, depth))
-				return False;
-			break;
-		case 0x09:
-			if(!sam_io_unk_info9("unk_inf9",&r_u->ctr->info.inf9, ps,depth))
-				return False;
-			break;
-		case 0x08:
-			if(!sam_io_unk_info8("unk_inf8",&r_u->ctr->info.inf8, ps,depth))
-				return False;
-			break;
-		case 0x07:
-			if(!sam_io_unk_info7("unk_inf7",&r_u->ctr->info.inf7, ps,depth))
-				return False;
-			break;
-		case 0x06:
-			if(!sam_io_unk_info6("unk_inf6",&r_u->ctr->info.inf6, ps,depth))
-				return False;
-			break;
-		case 0x05:
-			if(!sam_io_unk_info5("unk_inf5",&r_u->ctr->info.inf5, ps,depth))
-				return False;
-			break;
-		case 0x04:
-			if(!sam_io_unk_info4("unk_inf4",&r_u->ctr->info.inf4, ps,depth))
-				return False;
-			break;
-		case 0x03:
-			if(!sam_io_unk_info3("unk_inf3",&r_u->ctr->info.inf3, ps,depth))
-				return False;
-			break;
-		case 0x02:
-			if(!sam_io_unk_info2("unk_inf2",&r_u->ctr->info.inf2, ps,depth))
-				return False;
-			break;
-		case 0x01:
-			if(!sam_io_unk_info1("unk_inf1",&r_u->ctr->info.inf1, ps,depth))
-				return False;
-			break;
-		default:
-			DEBUG(0, ("samr_io_r_query_domain_info2: unknown switch level 0x%x\n",
-				r_u->switch_value));
-			r_u->status = NT_STATUS_INVALID_INFO_CLASS;
-			return False;
-		}
-	}
-	
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-	
-	return True;
-}
-
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
 void init_samr_q_set_domain_info(SAMR_Q_SET_DOMAIN_INFO *q_u,
 				POLICY_HND *domain_pol, uint16 switch_value, SAM_UNK_CTR *ctr)
 {