From f527fca984291e693f1ef758b208e02f14bf6733 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 4 Feb 2008 17:14:57 +0100
Subject: Remove unused marshalling for SAMR_CONNECT5.

Guenther
(This used to be commit d2d91dd4968dbd1349bdb973e2679f68c608c2ed)
---
 source3/include/rpc_samr.h     |  25 ----------
 source3/rpc_parse/parse_samr.c | 110 -----------------------------------------
 2 files changed, 135 deletions(-)

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 65e38c3e8b..227f709b86 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -1537,31 +1537,6 @@ typedef struct q_samr_connect4_info
 /* SAMR_R_CONNECT4 - same format as connect */
 typedef struct r_samr_connect_info SAMR_R_CONNECT4;       
 
-/* SAMR_Q_CONNECT5 */
-typedef struct q_samr_connect5_info
-{
-	uint32 ptr_srv_name; /* pointer to server name */
-	UNISTR2 uni_srv_name;
-	uint32 access_mask;
-	uint32 level;
-	/* These following are acutally a level dependent
-	   value. Fudge it for now. JRA */
-	uint32 info1_unk1;
-	uint32 info1_unk2;
-} SAMR_Q_CONNECT5;
-
-/* SAMR_R_CONNECT5 */
-typedef struct r_samr_connect_info5
-{
-	uint32 level;
-	uint32 info1_unk1;
-	uint32 info1_unk2;
-	POLICY_HND connect_pol;       /* policy handle */
-	NTSTATUS status;         /* return status */
-
-} SAMR_R_CONNECT5;
-
-
 /* SAMR_ENC_PASSWD */
 typedef struct enc_passwd_info
 {
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index e51bae3b6d..73b3086ad7 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -6217,116 +6217,6 @@ bool samr_io_r_connect4(const char *desc, SAMR_R_CONNECT4 * r_u,
 	return True;
 }
 
-/*******************************************************************
-inits a SAMR_Q_CONNECT5 structure.
-********************************************************************/
-
-void init_samr_q_connect5(SAMR_Q_CONNECT5 * q_u,
-			  char *srv_name, uint32 access_mask)
-{
-	DEBUG(5, ("init_samr_q_connect5\n"));
-
-	/* make PDC server name \\server */
-	q_u->ptr_srv_name = (srv_name != NULL && *srv_name) ? 1 : 0;
-	init_unistr2(&q_u->uni_srv_name, srv_name, UNI_STR_TERMINATE);
-
-	/* example values: 0x0000 0002 */
-	q_u->access_mask = access_mask;
-
-	q_u->level = 1;
-	q_u->info1_unk1 = 3;
-	q_u->info1_unk2 = 0;
-}
-
-/*******************************************************************
-inits a SAMR_R_CONNECT5 structure.
-********************************************************************/
-
-void init_samr_r_connect5(SAMR_R_CONNECT5 * r_u, POLICY_HND *pol, NTSTATUS status)
-{
-	DEBUG(5, ("init_samr_q_connect5\n"));
-
-	r_u->level = 1;
-	r_u->info1_unk1 = 3;
-	r_u->info1_unk2 = 0;
-
-	r_u->connect_pol = *pol;
-	r_u->status = status;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_connect5(const char *desc, SAMR_Q_CONNECT5 * q_u,
-			prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_connect5");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("ptr_srv_name", ps, depth, &q_u->ptr_srv_name))
-		return False;
-	if(!smb_io_unistr2("", &q_u->uni_srv_name, q_u->ptr_srv_name, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
-		return False;
-
-	if(!prs_uint32("level", ps, depth, &q_u->level))
-		return False;
-	if(!prs_uint32("level", ps, depth, &q_u->level))
-		return False;
-	
-	if(!prs_uint32("info1_unk1", ps, depth, &q_u->info1_unk1))
-		return False;
-	if(!prs_uint32("info1_unk2", ps, depth, &q_u->info1_unk2))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_connect5(const char *desc, SAMR_R_CONNECT5 * r_u,
-			prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_connect5");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("level", ps, depth, &r_u->level))
-		return False;
-	if(!prs_uint32("level", ps, depth, &r_u->level))
-		return False;
-	if(!prs_uint32("info1_unk1", ps, depth, &r_u->info1_unk1))
-		return False;
-	if(!prs_uint32("info1_unk2", ps, depth, &r_u->info1_unk2))
-		return False;
-
-	if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
 /*******************************************************************
 make a SAMR_ENC_PASSWD structure.
 ********************************************************************/
-- 
cgit