Remove unused marshalling for SAMR_QUERY_DOMAIN_INFO.

Guenther
(This used to be commit 28ef04437c1e575944e392d83f014d77998ec3ff)

3 files changed, 0 insertions, 215 deletions

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 1b95b23ad3..ff50edbc8d 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -445,18 +445,6 @@ typedef struct sam_user_info_9
 } SAM_USER_INFO_9;
 
 
-/****************************************************************************
-SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info.
-*****************************************************************************/
-
-/* SAMR_Q_QUERY_DOMAIN_INFO - */
-typedef struct q_samr_query_domain_info
-{
-	POLICY_HND domain_pol;   /* policy handle */
-	uint16 switch_value;     /* 0x0002, 0x0001 */
-
-} SAMR_Q_QUERY_DOMAIN_INFO;
-
 typedef struct sam_unknown_info_1_inf
 {
 	uint16 min_length_password;
@@ -578,20 +566,6 @@ typedef struct sam_unknown_ctr_info
 
 } SAM_UNK_CTR;
 
-
-/* SAMR_R_QUERY_DOMAIN_INFO - */
-typedef struct r_samr_query_domain_info
-{
-	uint32 ptr_0;
-	uint16 switch_value; /* same as in query */
-
-	SAM_UNK_CTR *ctr;
-
-	NTSTATUS status;         /* return status */
-
-} SAMR_R_QUERY_DOMAIN_INFO;
-
-
 #define MAX_SAM_ENTRIES_W2K 0x400
 #define MAX_SAM_ENTRIES_W95 50
 /* The following should be the greater of the preceeding two. */
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index d9427e3e4c..df3fa30b15 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -467,48 +467,6 @@ NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX *m
 	return result;
 }
 
-/* Query domain info */
-
-NTSTATUS rpccli_samr_query_dom_info(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_INFO q;
-	SAMR_R_QUERY_DOMAIN_INFO r;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-	DEBUG(10,("cli_samr_query_dom_info\n"));
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Marshall data and send request */
-
-	init_samr_q_query_domain_info(&q, domain_pol, switch_value);
-
-	r.ctr = ctr;
-
-	CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_DOMAIN_INFO,
-		q, r,
-		qbuf, rbuf,
-		samr_io_q_query_domain_info,
-		samr_io_r_query_domain_info,
-		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 9947f58736..39de1a82f6 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -29,44 +29,6 @@
 #define DBGC_CLASS DBGC_RPC_PARSE
 
 /*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-void init_samr_q_query_domain_info(SAMR_Q_QUERY_DOMAIN_INFO * q_u,
-				   POLICY_HND *domain_pol, uint16 switch_value)
-{
-	DEBUG(5, ("samr_init_samr_q_query_domain_info\n"));
-
-	q_u->domain_pol = *domain_pol;
-	q_u->switch_value = switch_value;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_query_domain_info(const char *desc, SAMR_Q_QUERY_DOMAIN_INFO * q_u,
-				 prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_query_domain_info");
-	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 structure.
 ********************************************************************/
 
@@ -624,115 +586,6 @@ static bool sam_io_unk_info13(const char *desc, SAM_UNK_INFO_13 * u_13,
 
 	return True;
 }
-
-/*******************************************************************
-inits a SAMR_R_QUERY_DOMAIN_INFO structure.
-********************************************************************/
-
-void init_samr_r_query_domain_info(SAMR_R_QUERY_DOMAIN_INFO * r_u,
-				   uint16 switch_value, SAM_UNK_CTR * ctr,
-				   NTSTATUS status)
-{
-	DEBUG(5, ("init_samr_r_query_domain_info\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_info(const char *desc, SAMR_R_QUERY_DOMAIN_INFO * r_u,
-				 prs_struct *ps, int depth)
-{
-        if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_query_domain_info");
-	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_info: 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 SAM_STR1 structure.
 ********************************************************************/