Remove marshalling for SAMR_LOOKUP_DOMAIN.

Guenther
(This used to be commit e03fd629171b625a42f02bdd6660b2ba75d27a4b)

3 files changed, 0 insertions, 150 deletions

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index e9c9efd899..affd1f2a10 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -613,28 +613,6 @@ typedef struct r_samr_query_domain_info
 } SAMR_R_QUERY_DOMAIN_INFO;
 
 
-/* SAMR_Q_LOOKUP_DOMAIN - obtain SID for a local domain */
-typedef struct q_samr_lookup_domain_info
-{
-	POLICY_HND connect_pol;
-
-	UNIHDR  hdr_domain;
-	UNISTR2 uni_domain;
-
-} SAMR_Q_LOOKUP_DOMAIN;
-
-
-/* SAMR_R_LOOKUP_DOMAIN */
-typedef struct r_samr_lookup_domain_info
-{
-	uint32   ptr_sid;
-	DOM_SID2 dom_sid;
-
-	NTSTATUS status;
-
-} SAMR_R_LOOKUP_DOMAIN;
-
-
 #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 8b4ad1e7e4..b0078c3433 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -1239,40 +1239,3 @@ NTSTATUS rpccli_samr_remove_sid_foreign_domain(struct rpc_pipe_client *cli,
 
 	return result;
 }
-
-/* Lookup Domain Name */
-
-NTSTATUS rpccli_samr_lookup_domain(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-				POLICY_HND *user_pol, char *domain_name, 
-				DOM_SID *sid)
-{
-	prs_struct qbuf, rbuf;
-	SAMR_Q_LOOKUP_DOMAIN q;
-	SAMR_R_LOOKUP_DOMAIN r;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-	DEBUG(10,("cli_samr_lookup_domain\n"));
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Marshall data and send request */
-
-	init_samr_q_lookup_domain(&q, user_pol, domain_name);
-
-	CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_LOOKUP_DOMAIN,
-		q, r,
-		qbuf, rbuf,
-		samr_io_q_lookup_domain,
-		samr_io_r_lookup_domain,
-		NT_STATUS_UNSUCCESSFUL); 
-
-	/* Return output parameters */
-
-	result = r.status;
-
-	if (NT_STATUS_IS_OK(result))
-		sid_copy(sid, &r.dom_sid.sid);
-
-	return result;
-}
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 1dc1ff0859..c75d77a502 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -29,97 +29,6 @@
 #define DBGC_CLASS DBGC_RPC_PARSE
 
 /*******************************************************************
-inits a SAMR_Q_LOOKUP_DOMAIN structure.
-********************************************************************/
-
-void init_samr_q_lookup_domain(SAMR_Q_LOOKUP_DOMAIN * q_u,
-			       POLICY_HND *pol, char *dom_name)
-{
-	DEBUG(5, ("init_samr_q_lookup_domain\n"));
-
-	q_u->connect_pol = *pol;
-
-	init_unistr2(&q_u->uni_domain, dom_name, UNI_FLAGS_NONE);
-	init_uni_hdr(&q_u->hdr_domain, &q_u->uni_domain);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-bool samr_io_q_lookup_domain(const char *desc, SAMR_Q_LOOKUP_DOMAIN * q_u,
-			     prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_lookup_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("connect_pol", &q_u->connect_pol, ps, depth))
-		return False;
-
-	if(!smb_io_unihdr("hdr_domain", &q_u->hdr_domain, ps, depth))
-		return False;
-
-	if(!smb_io_unistr2("uni_domain", &q_u->uni_domain, q_u->hdr_domain.buffer, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-inits a SAMR_R_LOOKUP_DOMAIN structure.
-********************************************************************/
-
-void init_samr_r_lookup_domain(SAMR_R_LOOKUP_DOMAIN * r_u,
-			       DOM_SID *dom_sid, NTSTATUS status)
-{
-	DEBUG(5, ("init_samr_r_lookup_domain\n"));
-
-	r_u->status = status;
-	r_u->ptr_sid = 0;
-	if (NT_STATUS_IS_OK(status)) {
-		r_u->ptr_sid = 1;
-		init_dom_sid2(&r_u->dom_sid, dom_sid);
-	}
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_lookup_domain(const char *desc, SAMR_R_LOOKUP_DOMAIN * r_u,
-			     prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_lookup_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("ptr", ps, depth, &r_u->ptr_sid))
-		return False;
-
-	if (r_u->ptr_sid != 0) {
-		if(!smb_io_dom_sid2("sid", &r_u->dom_sid, ps, depth))
-			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.
 ********************************************************************/