Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

(This used to be commit 7dbfc7bdc65314466a83e8121b35c9bcb24b2631)

9 files changed, 57 insertions, 2316 deletions

diff --git a/source3/rpc_parse/parse_buffer.c b/source3/rpc_parse/parse_buffer.c
index c30ad487dd..e98822d46e 100644
--- a/source3/rpc_parse/parse_buffer.c
+++ b/source3/rpc_parse/parse_buffer.c
@@ -435,7 +435,7 @@ bool smb_io_relsecdesc(const char *desc, RPC_BUFFER *buffer, int depth, SEC_DESC
 		}
 		
 		if (*secdesc != NULL) {
-			buffer->string_at_end -= sec_desc_size(*secdesc);
+			buffer->string_at_end -= ndr_size_security_descriptor(*secdesc, 0);
 
 			if(!prs_set_offset(ps, buffer->string_at_end))
 				return False;
diff --git a/source3/rpc_parse/parse_ds.c b/source3/rpc_parse/parse_ds.c
deleted file mode 100644
index 8f3ce361e7..0000000000
--- a/source3/rpc_parse/parse_ds.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- 
- *  Copyright (C) Gerald Carter				2002-2003
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-
-/************************************************************************
-************************************************************************/
-
-static bool ds_io_dominfobasic(const char *desc, DSROLE_PRIMARY_DOMAIN_INFO_BASIC **basic, prs_struct *ps, int depth)
-{
-	DSROLE_PRIMARY_DOMAIN_INFO_BASIC *p = *basic;
-	
-	if ( UNMARSHALLING(ps) ) {
-		p = *basic = PRS_ALLOC_MEM(ps, DSROLE_PRIMARY_DOMAIN_INFO_BASIC, 1);
-	}
-		
-	if ( !p )
-		return False;
-		
-	if ( !prs_uint16("machine_role", ps, depth, &p->machine_role) )
-		return False;
-	if ( !prs_align(ps) )
-		return False;
-
-	if ( !prs_uint32("flags", ps, depth, &p->flags) )
-		return False;
-
-	if ( !prs_uint32("netbios_ptr", ps, depth, &p->netbios_ptr) )
-		return False;
-	if ( !prs_uint32("dnsname_ptr", ps, depth, &p->dnsname_ptr) )
-		return False;
-	if ( !prs_uint32("forestname_ptr", ps, depth, &p->forestname_ptr) )
-		return False;
-		
-	if ( !smb_io_uuid("domain_guid", &p->domain_guid, ps, depth) )
-		return False;
-		
-	if ( !smb_io_unistr2( "netbios_domain", &p->netbios_domain, p->netbios_ptr, ps, depth) )
-		return False;
-	if ( !prs_align(ps) )
-		return False;
-	
-	if ( !smb_io_unistr2( "dns_domain", &p->dns_domain, p->dnsname_ptr, ps, depth) )
-		return False;
-	if ( !prs_align(ps) )
-		return False;
-	
-	if ( !smb_io_unistr2( "forest_domain", &p->forest_domain, p->forestname_ptr, ps, depth) )
-		return False;
-	if ( !prs_align(ps) )
-		return False;
-	
-		
-	return True;
-		
-}
-
-/************************************************************************
-************************************************************************/
-
-bool ds_io_q_getprimdominfo( const char *desc, DS_Q_GETPRIMDOMINFO *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "ds_io_q_getprimdominfo");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if ( !prs_uint16( "level", ps, depth, &q_u->level ) )
-		return False;
-		
-	return True;
-}
-
-/************************************************************************
-************************************************************************/
-
-bool ds_io_r_getprimdominfo( const char *desc, DS_R_GETPRIMDOMINFO *r_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "ds_io_r_getprimdominfo");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if ( !prs_uint32( "ptr", ps, depth, &r_u->ptr ) )
-		return False;
-		
-	if ( r_u->ptr )
-	{
-		if ( !prs_uint16( "level", ps, depth, &r_u->level ) )
-			return False;
-	
-		if ( !prs_uint16( "unknown0", ps, depth, &r_u->unknown0 ) )
-			return False;
-		
-		switch ( r_u->level )
-		{
-			case DsRolePrimaryDomainInfoBasic:
-				if ( !ds_io_dominfobasic( "dominfobasic", &r_u->info.basic, ps, depth) )
-					return False;
-				break;
-			default:
-				return False;
-		}
-	}
-
-	if ( !prs_align(ps) )
-		return False;
-	
-	if ( !prs_ntstatus("status", ps, depth, &r_u->status ) )
-		return False;		
-		
-	return True;
-}
-
-/************************************************************************
- initialize a DS_ENUM_DOM_TRUSTS structure
-************************************************************************/
-
-bool init_q_ds_enum_domain_trusts( DS_Q_ENUM_DOM_TRUSTS *q, const char *server, uint32 flags )
-{
-	q->flags = flags;
-	
-	if ( server && *server )
-		q->server_ptr = 1;
-	else
-		q->server_ptr = 0;
-
-	init_unistr2( &q->server, server, UNI_STR_TERMINATE);
-		
-	return True;
-}
-
-/************************************************************************
-************************************************************************/
-
-static bool ds_io_domain_trusts( const char *desc, DS_DOMAIN_TRUSTS *trust, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "ds_io_dom_trusts_ctr");
-	depth++;
-
-	if ( !prs_uint32( "netbios_ptr", ps, depth, &trust->netbios_ptr ) )
-		return False;
-	
-	if ( !prs_uint32( "dns_ptr", ps, depth, &trust->dns_ptr ) )
-		return False;
-	
-	if ( !prs_uint32( "flags", ps, depth, &trust->flags ) )
-		return False;
-	
-	if ( !prs_uint32( "parent_index", ps, depth, &trust->parent_index ) )
-		return False;
-	
-	if ( !prs_uint32( "trust_type", ps, depth, &trust->trust_type ) )
-		return False;
-	
-	if ( !prs_uint32( "trust_attributes", ps, depth, &trust->trust_attributes ) )
-		return False;
-	
-	if ( !prs_uint32( "sid_ptr", ps, depth, &trust->sid_ptr ) )
-		return False;
-	
-	if ( !smb_io_uuid("guid", &trust->guid, ps, depth) )
-		return False;
-	
-	return True;	
-}
-
-/************************************************************************
-************************************************************************/
-
-static bool ds_io_dom_trusts_ctr( const char *desc, DS_DOMAIN_TRUSTS_CTR *ctr, prs_struct *ps, int depth)
-{
-	int i;
-
-	prs_debug(ps, depth, desc, "ds_io_dom_trusts_ctr");
-	depth++;
-	
-	if ( !prs_uint32( "ptr", ps, depth, &ctr->ptr ) )
-		return False;
-	
-	if ( !prs_uint32( "max_count", ps, depth, &ctr->max_count ) )
-		return False;
-	
-	/* are we done? */
-	
-	if ( ctr->max_count == 0 )
-		return True;
-	
-	/* allocate the domain trusts array are parse it */
-	
-	ctr->trusts = TALLOC_ARRAY(ps->mem_ctx, DS_DOMAIN_TRUSTS, ctr->max_count);
-	
-	if ( !ctr->trusts )
-		return False;
-	
-	/* this stinks; the static portion o fthe structure is read here and then
-	   we need another loop to read the UNISTR2's and SID's */
-	   
-	for ( i=0; i<ctr->max_count;i++ ) {
-		if ( !ds_io_domain_trusts("domain_trusts", &ctr->trusts[i], ps, depth) )
-			return False;
-	}
-
-	for ( i=0; i<ctr->max_count; i++ ) {
-	
-		if ( !smb_io_unistr2("netbios_domain", &ctr->trusts[i].netbios_domain, ctr->trusts[i].netbios_ptr, ps, depth) )
-			return False;
-
-		if(!prs_align(ps))
-			return False;
-		
-		if ( !smb_io_unistr2("dns_domain", &ctr->trusts[i].dns_domain, ctr->trusts[i].dns_ptr, ps, depth) )
-			return False;
-
-		if(!prs_align(ps))
-			return False;
-			
-		if ( ctr->trusts[i].sid_ptr ) {
-			if ( !smb_io_dom_sid2("sid", &ctr->trusts[i].sid, ps, depth ) )
-				return False;		
-		}
-	}
-	
-	return True;
-}
-
-/************************************************************************
- initialize a DS_ENUM_DOM_TRUSTS request
-************************************************************************/
-
-bool ds_io_q_enum_domain_trusts( const char *desc, DS_Q_ENUM_DOM_TRUSTS *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "ds_io_q_enum_domain_trusts");
-	depth++;
-
-	if ( !prs_align(ps) )
-		return False;
-	
-	if ( !prs_uint32( "server_ptr", ps, depth, &q_u->server_ptr ) )
-		return False;
-	
-	if ( !smb_io_unistr2("server", &q_u->server, q_u->server_ptr, ps, depth) )
-			return False;
-	
-	if ( !prs_align(ps) )
-		return False;
-	
-	if ( !prs_uint32( "flags", ps, depth, &q_u->flags ) )
-		return False;
-	
-	return True;
-}
-
-/************************************************************************
-************************************************************************/
-
-bool ds_io_r_enum_domain_trusts( const char *desc, DS_R_ENUM_DOM_TRUSTS *r_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "ds_io_r_enum_domain_trusts");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if ( !prs_uint32( "num_domains", ps, depth, &r_u->num_domains ) )
-		return False;
-		
-	if ( r_u->num_domains ) {
-		if ( !ds_io_dom_trusts_ctr("domains", &r_u->domains, ps, depth) )
-			return False;
-	}
-		
-	if(!prs_align(ps))
-		return False;
-			
-	if ( !prs_ntstatus("status", ps, depth, &r_u->status ) )
-		return False;		
-		
-	return True;
-}
diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index 59fce4a904..1bddfba28e 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -909,21 +909,6 @@ bool lsa_io_dom_query_12(const char *desc, DOM_QUERY_12 *info, prs_struct *ps, i
 	
 }
 
-/*******************************************************************
- Inits an LSA_Q_QUERY_INFO structure.
-********************************************************************/
-
-void init_q_set(LSA_Q_SET_INFO *in, POLICY_HND *hnd, uint16 info_class, LSA_INFO_CTR ctr)
-{
-	DEBUG(5,("init_q_set\n"));
-
-	in->info_class = info_class;
-
-	in->pol = *hnd;
-
-	in->ctr = ctr;
-	in->ctr.info_class = info_class;
-}
 
 /*******************************************************************
 reads or writes a structure.
@@ -1065,49 +1050,6 @@ bool lsa_io_r_query(const char *desc, LSA_R_QUERY_INFO *out, prs_struct *ps, int
 }
 
 /*******************************************************************
- Reads or writes an LSA_Q_SET_INFO structure.
-********************************************************************/
-
-bool lsa_io_q_set(const char *desc, LSA_Q_SET_INFO *in, prs_struct *ps, 
-		  int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_set");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("", &in->pol, ps, depth))
-		return False;
-
-	if(!prs_uint16("info_class", ps, depth, &in->info_class))
-		return False;
-
-	if(!lsa_io_query_info_ctr("", ps, depth, &in->ctr))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_R_SET_INFO structure.
-********************************************************************/
-
-bool lsa_io_r_set(const char *desc, LSA_R_SET_INFO *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_set");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
  Inits a LSA_SID_ENUM structure.
 ********************************************************************/
 
@@ -2140,53 +2082,6 @@ bool lsa_io_r_lookup_names4(const char *desc, LSA_R_LOOKUP_NAMES4 *out, prs_stru
 }
 
 /*******************************************************************
- Reads or writes an LSA_Q_OPEN_SECRET structure.
-********************************************************************/
-
-bool lsa_io_q_open_secret(const char *desc, LSA_Q_OPEN_SECRET *in, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_open_secret");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("", &in->handle, ps, depth))
-		return False;
-
-	if(!prs_unistr4 ("secretname", ps, depth, &in->secretname))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("access", ps, depth, &in->access))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_R_OPEN_SECRET structure.
-********************************************************************/
-
-bool lsa_io_r_open_secret(const char *desc, LSA_R_OPEN_SECRET *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_open_secret");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-   
-	if(!smb_io_pol_hnd("", &out->handle, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
  Inits an LSA_Q_ENUM_PRIVS structure.
 ********************************************************************/
 
@@ -3373,309 +3268,6 @@ bool lsa_io_r_remove_acct_rights(const char *desc, LSA_R_REMOVE_ACCT_RIGHTS *out
 }
 
 /*******************************************************************
- Inits an LSA_Q_OPEN_TRUSTED_DOMAIN structure.
-********************************************************************/
-
-void init_lsa_q_open_trusted_domain(LSA_Q_OPEN_TRUSTED_DOMAIN *q, POLICY_HND *hnd, DOM_SID *sid, uint32 desired_access)
-{
-	memcpy(&q->pol, hnd, sizeof(q->pol));
-
-	init_dom_sid2(&q->sid, sid);
-	q->access_mask = desired_access;
-}
-
-/*******************************************************************
-********************************************************************/
-
-#if 0 /* jerry, I think this not correct - gd */
-bool lsa_io_q_open_trusted_domain(const char *desc, LSA_Q_OPEN_TRUSTED_DOMAIN *in, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_open_trusted_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (!smb_io_pol_hnd("", &in->handle, ps, depth))
-		return False;
-
-	if(!prs_uint32("count", ps, depth, &in->count))
-		return False;
-
-	if(!smb_io_dom_sid("sid", &in->sid, ps, depth))
-		return False;
-
-	return True;
-}
-#endif
-
-
-/*******************************************************************
- Inits an LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME structure.
-********************************************************************/
-
-void init_lsa_q_open_trusted_domain_by_name(LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME *q, 
-					    POLICY_HND *hnd, 
-					    const char *name, 
-					    uint32 desired_access)
-{
-	memcpy(&q->pol, hnd, sizeof(q->pol));
-
-	init_lsa_string(&q->name, name);
-	q->access_mask = desired_access;
-}
-
-/*******************************************************************
-********************************************************************/
-
-
-/*******************************************************************
- Reads or writes an LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME structure.
-********************************************************************/
-
-bool lsa_io_q_open_trusted_domain_by_name(const char *desc, LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME *q_o, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_open_trusted_domain_by_name");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
- 
-	if(!smb_io_pol_hnd("pol", &q_o->pol, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_lsa_string("name", &q_o->name, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
- 	if(!prs_uint32("access", ps, depth, &q_o->access_mask))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_R_OPEN_TRUSTED_DOMAIN_BY_NAME structure.
-********************************************************************/
-
-bool lsa_io_r_open_trusted_domain_by_name(const char *desc, LSA_R_OPEN_TRUSTED_DOMAIN_BY_NAME *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_open_trusted_domain_by_name");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (!smb_io_pol_hnd("handle", &out->handle, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_q_open_trusted_domain(const char *desc, LSA_Q_OPEN_TRUSTED_DOMAIN *q_o, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_open_trusted_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
- 
-	if(!smb_io_pol_hnd("pol", &q_o->pol, ps, depth))
-		return False;
-
-	if(!smb_io_dom_sid2("sid", &q_o->sid, ps, depth))
-		return False;
-
- 	if(!prs_uint32("access", ps, depth, &q_o->access_mask))
-		return False;
-  
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_R_OPEN_TRUSTED_DOMAIN structure.
-********************************************************************/
-
-bool lsa_io_r_open_trusted_domain(const char *desc, LSA_R_OPEN_TRUSTED_DOMAIN *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_open_trusted_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (!smb_io_pol_hnd("handle", &out->handle, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_q_create_trusted_domain(const char *desc, LSA_Q_CREATE_TRUSTED_DOMAIN *in, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_create_trusted_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("", &in->handle, ps, depth))
-		return False;
-
-	if(!prs_unistr4 ("secretname", ps, depth, &in->secretname))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("access", ps, depth, &in->access))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_r_create_trusted_domain(const char *desc, LSA_R_CREATE_TRUSTED_DOMAIN *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_create_trusted_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (!smb_io_pol_hnd("", &out->handle, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_q_create_secret(const char *desc, LSA_Q_CREATE_SECRET *in, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_create_secret");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("", &in->handle, ps, depth))
-		return False;
-
-	if(!prs_unistr4 ("secretname", ps, depth, &in->secretname))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("access", ps, depth, &in->access))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_r_create_secret(const char *desc, LSA_R_CREATE_SECRET *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_create_secret");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (!smb_io_pol_hnd("", &out->handle, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-
-
-/*******************************************************************
-********************************************************************/
-
-static bool lsa_io_data_blob( const char *desc, prs_struct *ps, int depth, LSA_DATA_BLOB *blob )
-{
-	prs_debug(ps, depth, desc, "lsa_io_data_blob");
-	depth++;
-
-	if ( !prs_uint32("size", ps, depth, &blob->size) )
-		return False;
-	if ( !prs_uint32("size", ps, depth, &blob->size) )
-		return False;
-
-	if ( !prs_io_unistr2_p(desc, ps, depth, &blob->data) )
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_q_set_secret(const char *desc, LSA_Q_SET_SECRET *in, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_set_secret");
-	depth++;
-
-	if ( !prs_align(ps) )
-		return False;
-
-	if ( !smb_io_pol_hnd("", &in->handle, ps, depth) )
-		return False;
-
-	if ( !prs_pointer( "old_value", ps, depth, (void*)&in->old_value, sizeof(LSA_DATA_BLOB), (PRS_POINTER_CAST)lsa_io_data_blob ))
-		return False;
-
-	if( !prs_align(ps) )
-		return False;
-	if ( !prs_pointer( "old_value", ps, depth, (void*)&in->old_value, sizeof(LSA_DATA_BLOB), (PRS_POINTER_CAST)lsa_io_data_blob ))
-		return False;
-
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_r_set_secret(const char *desc, LSA_R_SET_SECRET *out, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_set_secret");
-	depth++;
-
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
 ********************************************************************/
 
 bool lsa_io_q_delete_object(const char *desc, LSA_Q_DELETE_OBJECT *in, prs_struct *ps, int depth)
@@ -3705,474 +3297,3 @@ bool lsa_io_r_delete_object(const char *desc, LSA_R_DELETE_OBJECT *out, prs_stru
 
 	return True;
 }
-
-/*******************************************************************
- Inits an LSA_Q_QUERY_TRUSTED_DOMAIN_INFO structure.
-********************************************************************/
-
-void init_q_query_trusted_domain_info(LSA_Q_QUERY_TRUSTED_DOMAIN_INFO *q, 
-				      POLICY_HND *hnd, uint16 info_class) 
-{
-	DEBUG(5, ("init_q_query_trusted_domain_info\n"));
-	
-	q->pol = *hnd;
-	q->info_class = info_class;
-}
-
-/*******************************************************************
- Inits an LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME structure.
-********************************************************************/
-
-void init_q_query_trusted_domain_info_by_name(LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME *q, 
-					      POLICY_HND *hnd, uint16 info_class, 
-					      const char *dom_name)
-{
-	DEBUG(5, ("init_q_query_trusted_domain_info_by_name\n"));
-	
-	q->pol = *hnd;
-	init_lsa_string(&q->domain_name, dom_name );
-	q->info_class = info_class;
-}
-
-/*******************************************************************
- Inits an LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID structure.
-********************************************************************/
-
-void init_q_query_trusted_domain_info_by_sid(LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID *q, 
-					     POLICY_HND *hnd, uint16 info_class, 
-					     DOM_SID *dom_sid)
-{
-	DEBUG(5, ("init_q_query_trusted_domain_info_by_sid\n"));
-	
-	q->pol = *hnd;
-	init_dom_sid2(&q->dom_sid, dom_sid);
-	q->info_class = info_class;
-}
-
-/*******************************************************************
- Reads or writes an LSA_Q_QUERY_TRUSTED_DOMAIN_INFO structure.
-********************************************************************/
-
-bool lsa_io_q_query_trusted_domain_info(const char *desc, 
-					LSA_Q_QUERY_TRUSTED_DOMAIN_INFO *q_q,
-					prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_query_trusted_domain_info");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("pol", &q_q->pol, ps, depth))
-		return False;
-
-	if(!prs_uint16("info_class", ps, depth, &q_q->info_class))
-		return False;
-
-	return True;
-}
-
-
-/*******************************************************************
- Reads or writes an LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID structure.
-********************************************************************/
-
-bool lsa_io_q_query_trusted_domain_info_by_sid(const char *desc, 
-					       LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID *q_q,
-					       prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_query_trusted_domain_info_by_sid");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("pol", &q_q->pol, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_dom_sid2("dom_sid", &q_q->dom_sid, ps, depth))
-		return False;
-
-	if(!prs_uint16("info_class", ps, depth, &q_q->info_class))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME structure.
-********************************************************************/
-
-bool lsa_io_q_query_trusted_domain_info_by_name(const char *desc, 
-					        LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME *q_q,
-					        prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_query_trusted_domain_info_by_name");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("pol", &q_q->pol, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_lsa_string("domain_name", &q_q->domain_name, ps, depth))
-		return False;
-
-	if(!prs_uint16("info_class", ps, depth, &q_q->info_class))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool smb_io_lsa_data_buf_hdr(const char *desc, LSA_DATA_BUF_HDR *buf_hdr, 
-			  	    prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "smb_io_lsa_data_buf_hdr");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("length", ps, depth, &buf_hdr->length))
-		return False;
-	
-	if(!prs_uint32("size", ps, depth, &buf_hdr->size))
-		return False;
-
-	if (!prs_uint32("data_ptr", ps, depth, &buf_hdr->data_ptr))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool smb_io_lsa_data_buf(const char *desc, LSA_DATA_BUF *buf, 
-				prs_struct *ps, int depth, int length, int size)
-{
-	prs_debug(ps, depth, desc, "smb_io_lsa_data_buf");
-	depth++;
-
-	if ( UNMARSHALLING(ps) && length ) {
-		if ( !(buf->data = PRS_ALLOC_MEM( ps, uint8, length )) )
-			return False;
-	}
-
-	if (!prs_uint32("size", ps, depth, &buf->size))
-		return False;
-
-	if (!prs_uint32("offset", ps, depth, &buf->offset))
-		return False;
-
-	if (!prs_uint32("length", ps, depth, &buf->length))
-		return False;
-
-	if(!prs_uint8s(False, "data", ps, depth, buf->data, length))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool lsa_io_trustdom_query_1(const char *desc, TRUSTED_DOMAIN_INFO_NAME *name, 
-				    prs_struct *ps, int depth)
-{
-	if (!smb_io_lsa_string("netbios_name", &name->netbios_name, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool lsa_io_trustdom_query_3(const char *desc, TRUSTED_DOMAIN_INFO_POSIX_OFFSET *posix, 
-				    prs_struct *ps, int depth)
-{
-	if(!prs_uint32("posix_offset", ps, depth, &posix->posix_offset))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool lsa_io_trustdom_query_4(const char *desc, TRUSTED_DOMAIN_INFO_PASSWORD *password, 
-				    prs_struct *ps, int depth)
-{
-	if(!prs_align(ps))
-		return False;
-	
-	if(!prs_uint32("ptr_password", ps, depth, &password->ptr_password))
-		return False;
-
-	if(!prs_uint32("ptr_old_password", ps, depth, &password->ptr_old_password))
-		return False;
-
-	if (&password->ptr_password) {
-	
-		if (!smb_io_lsa_data_buf_hdr("password_hdr", &password->password_hdr, ps, depth))
-			return False;
-
-		if (!smb_io_lsa_data_buf("password", &password->password, ps, depth, 
-					password->password_hdr.length, password->password_hdr.size))
-			return False;
-	}
-
-	if (&password->ptr_old_password) {
-
-		if (!smb_io_lsa_data_buf_hdr("old_password_hdr", &password->old_password_hdr, ps, depth))
-			return False;
-
-		if (!smb_io_lsa_data_buf("old_password", &password->old_password, ps, depth, 
-					password->old_password_hdr.length, password->old_password_hdr.size))
-			return False;
-	}
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool lsa_io_trustdom_query_6(const char *desc, TRUSTED_DOMAIN_INFO_EX *info_ex, 
-				    prs_struct *ps, int depth)
-{
-	uint32 dom_sid_ptr;
-	
-	if (!smb_io_unihdr("domain_name_hdr", &info_ex->domain_name.hdr, ps, depth))
-		return False;
-		
-	if (!smb_io_unihdr("netbios_name_hdr", &info_ex->netbios_name.hdr, ps, depth))
-		return False;
-
-	if (!prs_uint32("dom_sid_ptr", ps, depth, &dom_sid_ptr))
-		return False;
-
-	if (!prs_uint32("trust_direction", ps, depth, &info_ex->trust_direction))
-		return False;
-
-	if (!prs_uint32("trust_type", ps, depth, &info_ex->trust_type))
-		return False;
-
-	if (!prs_uint32("trust_attributes", ps, depth, &info_ex->trust_attributes))
-		return False;
-		
-	if (!smb_io_unistr2("domain_name_unistring", &info_ex->domain_name.unistring, info_ex->domain_name.hdr.buffer, ps, depth))
-		return False;
-		
-	if (!smb_io_unistr2("netbios_name_unistring", &info_ex->netbios_name.unistring, info_ex->netbios_name.hdr.buffer, ps, depth))
-		return False;
-
-	if (!smb_io_dom_sid2("sid", &info_ex->sid, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-static bool lsa_io_trustdom_query(const char *desc, prs_struct *ps, int depth, LSA_TRUSTED_DOMAIN_INFO *info)
-{
-	prs_debug(ps, depth, desc, "lsa_io_trustdom_query");
-	depth++;
-
-	if(!prs_uint16("info_class", ps, depth, &info->info_class))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	switch (info->info_class) {
-	case 1:
-		if(!lsa_io_trustdom_query_1("name", &info->name, ps, depth))
-			return False;
-		break;
-	case 3:
-		if(!lsa_io_trustdom_query_3("posix_offset", &info->posix_offset, ps, depth))
-			return False;
-		break;
-	case 4:
-		if(!lsa_io_trustdom_query_4("password", &info->password, ps, depth))
-			return False;
-		break;
-	case 6:
-		if(!lsa_io_trustdom_query_6("info_ex", &info->info_ex, ps, depth))
-			return False;
-		break;
-	default:
-		DEBUG(0,("unsupported info-level: %d\n", info->info_class));
-		return False;
-	}
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_R_QUERY_TRUSTED_DOMAIN_INFO structure.
-********************************************************************/
-
-bool lsa_io_r_query_trusted_domain_info(const char *desc, 
-					LSA_R_QUERY_TRUSTED_DOMAIN_INFO *r_q, 
-					prs_struct *ps, int depth)
-{
-	if (r_q == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "lsa_io_r_query_trusted_domain_info");
-	depth++;
-
-	if (!prs_pointer("trustdom", ps, depth, (void*)&r_q->info, 
-			 sizeof(LSA_TRUSTED_DOMAIN_INFO), 
-			 (PRS_POINTER_CAST)lsa_io_trustdom_query) )
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_q->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Inits an LSA_Q_QUERY_DOM_INFO_POLICY structure.
-********************************************************************/
-
-void init_q_query_dom_info(LSA_Q_QUERY_DOM_INFO_POLICY *in, POLICY_HND *hnd, uint16 info_class)
-{
-	DEBUG(5, ("init_q_query_dom_info\n"));
-
-	memcpy(&in->pol, hnd, sizeof(in->pol));
-
-	in->info_class = info_class;
-}
-
-/*******************************************************************
- Reads or writes an LSA_Q_QUERY_DOM_INFO_POLICY structure.
-********************************************************************/
-
-bool lsa_io_q_query_dom_info(const char *desc, LSA_Q_QUERY_DOM_INFO_POLICY *in, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_q_query_dom_info");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
- 
-	if(!smb_io_pol_hnd("pol", &in->pol, ps, depth))
-		return False;
-	
-	if(!prs_uint16("info_class", ps, depth, &in->info_class))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an LSA_R_QUERY_DOM_INFO_POLICY structure.
-********************************************************************/
-
-static bool lsa_io_dominfo_query_3(const char *desc, LSA_DOM_INFO_POLICY_KERBEROS *krb_policy, 
-				   prs_struct *ps, int depth)
-{
-	if (!prs_align_uint64(ps))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("enforce_restrictions", ps, depth, &krb_policy->enforce_restrictions))
-		return False;
-
-	if (!prs_align_uint64(ps))
-		return False;
-
-	if (!smb_io_nttime("service_tkt_lifetime", ps, depth, &krb_policy->service_tkt_lifetime))
-		return False;
-
-	if (!prs_align_uint64(ps))
-		return False;
-	
-	if (!smb_io_nttime("user_tkt_lifetime", ps, depth, &krb_policy->user_tkt_lifetime))
-		return False;
-
-	if (!prs_align_uint64(ps))
-		return False;
-	
-	if (!smb_io_nttime("user_tkt_renewaltime", ps, depth, &krb_policy->user_tkt_renewaltime))
-		return False;
-
-	if (!prs_align_uint64(ps))
-		return False;
-	
-	if (!smb_io_nttime("clock_skew", ps, depth, &krb_policy->clock_skew))
-		return False;
-
-	if (!prs_align_uint64(ps))
-		return False;
-	
-	if (!smb_io_nttime("unknown6", ps, depth, &krb_policy->unknown6))
-		return False;
-
-	return True;
-}
-
-static bool lsa_io_dom_info_query(const char *desc, prs_struct *ps, int depth, LSA_DOM_INFO_UNION *info)
-{
-	prs_debug(ps, depth, desc, "lsa_io_dom_info_query");
-	depth++;
-
-	if(!prs_align_uint16(ps))
-		return False;
-
-	if(!prs_uint16("info_class", ps, depth, &info->info_class))
-		return False;
-
-	switch (info->info_class) {
-	case 3: 
-		if (!lsa_io_dominfo_query_3("krb_policy", &info->krb_policy, ps, depth))
-			return False;
-		break;
-	default:
-		DEBUG(0,("unsupported info-level: %d\n", info->info_class));
-		return False;
-		break;
-	}
-
-	return True;
-}
-
-
-bool lsa_io_r_query_dom_info(const char *desc, LSA_R_QUERY_DOM_INFO_POLICY *out,
-			     prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "lsa_io_r_query_dom_info");
-	depth++;
-
-	if (!prs_pointer("dominfo", ps, depth, (void*)&out->info, 
-			 sizeof(LSA_DOM_INFO_UNION), 
-			 (PRS_POINTER_CAST)lsa_io_dom_info_query) )
-		return False;
-	
-	if(!prs_ntstatus("status", ps, depth, &out->status))
-		return False;
-
-	return True;
-}
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 65607a4ac8..d6a99b8731 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -1656,8 +1656,8 @@ static void dump_acct_flags(uint32 acct_flags) {
 	if (acct_flags & ACB_NO_AUTH_DATA_REQD) {
 		DEBUGADD(lvl,("\taccount has ACB_NO_AUTH_DATA_REQD set\n"));
 	}
-	if (acct_flags & ACB_PWEXPIRED) {
-		DEBUGADD(lvl,("\taccount has ACB_PWEXPIRED set\n"));
+	if (acct_flags & ACB_PW_EXPIRED) {
+		DEBUGADD(lvl,("\taccount has ACB_PW_EXPIRED set\n"));
 	}
 }
 
@@ -1665,23 +1665,23 @@ static void dump_user_flgs(uint32 user_flags) {
 
 	int lvl = 10;
 	DEBUG(lvl,("dump_user_flgs\n"));
-	if (user_flags & LOGON_EXTRA_SIDS) {
-		DEBUGADD(lvl,("\taccount has LOGON_EXTRA_SIDS\n"));
+	if (user_flags & NETLOGON_EXTRA_SIDS) {
+		DEBUGADD(lvl,("\taccount has NETLOGON_EXTRA_SIDS\n"));
 	}
-	if (user_flags & LOGON_RESOURCE_GROUPS) {
-		DEBUGADD(lvl,("\taccount has LOGON_RESOURCE_GROUPS\n"));
+	if (user_flags & NETLOGON_RESOURCE_GROUPS) {
+		DEBUGADD(lvl,("\taccount has NETLOGON_RESOURCE_GROUPS\n"));
 	}
-	if (user_flags & LOGON_NTLMV2_ENABLED) {
-		DEBUGADD(lvl,("\taccount has LOGON_NTLMV2_ENABLED\n"));
+	if (user_flags & NETLOGON_NTLMV2_ENABLED) {
+		DEBUGADD(lvl,("\taccount has NETLOGON_NTLMV2_ENABLED\n"));
 	}
-	if (user_flags & LOGON_CACHED_ACCOUNT) {
-		DEBUGADD(lvl,("\taccount has LOGON_CACHED_ACCOUNT\n"));
+	if (user_flags & NETLOGON_CACHED_ACCOUNT) {
+		DEBUGADD(lvl,("\taccount has NETLOGON_CACHED_ACCOUNT\n"));
 	}
-	if (user_flags & LOGON_PROFILE_PATH_RETURNED) {
-		DEBUGADD(lvl,("\taccount has LOGON_PROFILE_PATH_RETURNED\n"));
+	if (user_flags & NETLOGON_PROFILE_PATH_RETURNED) {
+		DEBUGADD(lvl,("\taccount has NETLOGON_PROFILE_PATH_RETURNED\n"));
 	}
-	if (user_flags & LOGON_SERVER_TRUST_ACCOUNT) {
-		DEBUGADD(lvl,("\taccount has LOGON_SERVER_TRUST_ACCOUNT\n"));
+	if (user_flags & NETLOGON_SERVER_TRUST_ACCOUNT) {
+		DEBUGADD(lvl,("\taccount has NETLOGON_SERVER_TRUST_ACCOUNT\n"));
 	}
 
 
@@ -1859,8 +1859,8 @@ bool net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
 
 		uint32 num_other_sids = usr->num_other_sids;
 
-		if (!(usr->user_flgs & LOGON_EXTRA_SIDS)) {
-			DEBUG(10,("net_io_user_info3: user_flgs attribute does not have LOGON_EXTRA_SIDS\n"));
+		if (!(usr->user_flgs & NETLOGON_EXTRA_SIDS)) {
+			DEBUG(10,("net_io_user_info3: user_flgs attribute does not have NETLOGON_EXTRA_SIDS\n"));
 			/* return False; */
 		}
 
@@ -3440,67 +3440,6 @@ void init_net_q_dsr_getdcname(NET_Q_DSR_GETDCNAME *r_t, const char *server_unc,
 }
 
 /*******************************************************************
- Inits a NET_Q_DSR_GETDCNAMEEX structure.
-********************************************************************/
-
-void init_net_q_dsr_getdcnameex(NET_Q_DSR_GETDCNAMEEX *r_t, const char *server_unc,
-				const char *domain_name,
-				struct GUID *domain_guid,
-				const char *site_name,
-				uint32_t flags)
-{
-	DEBUG(5, ("init_net_q_dsr_getdcnameex\n"));
-
-	r_t->ptr_server_unc = (server_unc != NULL);
-	init_unistr2(&r_t->uni_server_unc, server_unc, UNI_STR_TERMINATE);
-
-	r_t->ptr_domain_name = (domain_name != NULL);
-	init_unistr2(&r_t->uni_domain_name, domain_name, UNI_STR_TERMINATE);
-
-	r_t->ptr_domain_guid = (domain_guid != NULL);
-	r_t->domain_guid = domain_guid;
-
-	r_t->ptr_site_name = (site_name != NULL);
-	init_unistr2(&r_t->uni_site_name, site_name, UNI_STR_TERMINATE);
-
-	r_t->flags = flags;
-}
-
-/*******************************************************************
- Inits a NET_Q_DSR_GETDCNAMEEX2 structure.
-********************************************************************/
-
-void init_net_q_dsr_getdcnameex2(NET_Q_DSR_GETDCNAMEEX2 *r_t, const char *server_unc,
-				 const char *domain_name,
-				 const char *client_account,
-				 uint32 mask,
-				 struct GUID *domain_guid,
-				 const char *site_name,
-				 uint32_t flags)
-{
-	DEBUG(5, ("init_net_q_dsr_getdcnameex2\n"));
-
-	r_t->ptr_server_unc = (server_unc != NULL);
-	init_unistr2(&r_t->uni_server_unc, server_unc, UNI_STR_TERMINATE);
-
-	r_t->ptr_client_account = (client_account != NULL);
-	init_unistr2(&r_t->uni_client_account, client_account, UNI_STR_TERMINATE);
-
-	r_t->mask = mask;
-
-	r_t->ptr_domain_name = (domain_name != NULL);
-	init_unistr2(&r_t->uni_domain_name, domain_name, UNI_STR_TERMINATE);
-
-	r_t->ptr_domain_guid = (domain_guid != NULL);
-	r_t->domain_guid = domain_guid;
-
-	r_t->ptr_site_name = (site_name != NULL);
-	init_unistr2(&r_t->uni_site_name, site_name, UNI_STR_TERMINATE);
-
-	r_t->flags = flags;
-}
-
-/*******************************************************************
  Reads or writes an NET_Q_DSR_GETDCNAME structure.
 ********************************************************************/
 
@@ -3572,154 +3511,6 @@ bool net_io_q_dsr_getdcname(const char *desc, NET_Q_DSR_GETDCNAME *r_t,
 }
 
 /*******************************************************************
- Reads or writes an NET_Q_DSR_GETDCNAMEEX structure.
-********************************************************************/
-
-bool net_io_q_dsr_getdcnameex(const char *desc, NET_Q_DSR_GETDCNAMEEX *r_t,
-			      prs_struct *ps, int depth)
-{
-	if (r_t == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_q_dsr_getdcnameex");
-	depth++;
-
-	if (!prs_uint32("ptr_server_unc", ps, depth, &r_t->ptr_server_unc))
-		return False;
-
-	if (!smb_io_unistr2("server_unc", &r_t->uni_server_unc,
-			    r_t->ptr_server_unc, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_domain_name", ps, depth, &r_t->ptr_domain_name))
-		return False;
-
-	if (!smb_io_unistr2("domain_name", &r_t->uni_domain_name,
-			    r_t->ptr_domain_name, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_domain_guid", ps, depth, &r_t->ptr_domain_guid))
-		return False;
-
-	if (UNMARSHALLING(ps) && (r_t->ptr_domain_guid)) {
-		r_t->domain_guid = PRS_ALLOC_MEM(ps, struct GUID, 1);
-		if (r_t->domain_guid == NULL)
-			return False;
-	}
-
-	if ((r_t->ptr_domain_guid) &&
-	    (!smb_io_uuid("domain_guid", r_t->domain_guid, ps, depth)))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_site_name", ps, depth, &r_t->ptr_site_name))
-		return False;
-
-	if (!smb_io_unistr2("site_name", &r_t->uni_site_name,
-			    r_t->ptr_site_name, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("flags", ps, depth, &r_t->flags))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes an NET_Q_DSR_GETDCNAMEEX2 structure.
-********************************************************************/
-
-bool net_io_q_dsr_getdcnameex2(const char *desc, NET_Q_DSR_GETDCNAMEEX2 *r_t,
-			       prs_struct *ps, int depth)
-{
-	if (r_t == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_q_dsr_getdcnameex2");
-	depth++;
-
-	if (!prs_uint32("ptr_server_unc", ps, depth, &r_t->ptr_server_unc))
-		return False;
-
-	if (!smb_io_unistr2("server_unc", &r_t->uni_server_unc,
-			    r_t->ptr_server_unc, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_client_account", ps, depth, &r_t->ptr_client_account))
-		return False;
-
-	if (!smb_io_unistr2("client_account", &r_t->uni_client_account,
-			    r_t->ptr_client_account, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("mask", ps, depth, &r_t->mask))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_domain_name", ps, depth, &r_t->ptr_domain_name))
-		return False;
-
-	if (!smb_io_unistr2("domain_name", &r_t->uni_domain_name,
-			    r_t->ptr_domain_name, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_domain_guid", ps, depth, &r_t->ptr_domain_guid))
-		return False;
-
-	if (UNMARSHALLING(ps) && (r_t->ptr_domain_guid)) {
-		r_t->domain_guid = PRS_ALLOC_MEM(ps, struct GUID, 1);
-		if (r_t->domain_guid == NULL)
-			return False;
-	}
-
-	if ((r_t->ptr_domain_guid) &&
-	    (!smb_io_uuid("domain_guid", r_t->domain_guid, ps, depth)))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_site_name", ps, depth, &r_t->ptr_site_name))
-		return False;
-
-	if (!smb_io_unistr2("site_name", &r_t->uni_site_name,
-			    r_t->ptr_site_name, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("flags", ps, depth, &r_t->flags))
-		return False;
-
-	return True;
-}
-
-
-
-/*******************************************************************
  Inits a NET_R_DSR_GETDCNAME structure.
 ********************************************************************/
 void init_net_r_dsr_getdcname(NET_R_DSR_GETDCNAME *r_t, const char *dc_unc,
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index 4abf63e71d..638d71a73e 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -85,7 +85,7 @@ void prs_dump_region(const char *name, int v, prs_struct *ps,
 
 void prs_debug(prs_struct *ps, int depth, const char *desc, const char *fn_name)
 {
-	DEBUG(5+depth, ("%s%06x %s %s\n", tab_depth(depth), ps->data_offset, fn_name, desc));
+	DEBUG(5+depth, ("%s%06x %s %s\n", tab_depth(5+depth,depth), ps->data_offset, fn_name, desc));
 }
 
 /**
@@ -621,7 +621,7 @@ bool prs_uint8(const char *name, prs_struct *ps, int depth, uint8 *data8)
 	else
 		SCVAL(q,0,*data8);
 
-	DEBUG(5,("%s%04x %s: %02x\n", tab_depth(depth), ps->data_offset, name, *data8));
+	DEBUG(5,("%s%04x %s: %02x\n", tab_depth(5,depth), ps->data_offset, name, *data8));
 
 	ps->data_offset += 1;
 
@@ -686,7 +686,7 @@ bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16)
 			SSVAL(q,0,*data16);
 	}
 
-	DEBUG(5,("%s%04x %s: %04x\n", tab_depth(depth), ps->data_offset, name, *data16));
+	DEBUG(5,("%s%04x %s: %04x\n", tab_depth(5,depth), ps->data_offset, name, *data16));
 
 	ps->data_offset += sizeof(uint16);
 
@@ -715,7 +715,7 @@ bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32 *data32)
 			SIVAL(q,0,*data32);
 	}
 
-	DEBUG(5,("%s%04x %s: %08x\n", tab_depth(depth), ps->data_offset, name, *data32));
+	DEBUG(5,("%s%04x %s: %08x\n", tab_depth(5,depth), ps->data_offset, name, *data32));
 
 	ps->data_offset += sizeof(uint32);
 
@@ -744,7 +744,7 @@ bool prs_int32(const char *name, prs_struct *ps, int depth, int32 *data32)
 			SIVALS(q,0,*data32);
 	}
 
-	DEBUG(5,("%s%04x %s: %08x\n", tab_depth(depth), ps->data_offset, name, *data32));
+	DEBUG(5,("%s%04x %s: %08x\n", tab_depth(5,depth), ps->data_offset, name, *data32));
 
 	ps->data_offset += sizeof(int32);
 
@@ -773,7 +773,7 @@ bool prs_ntstatus(const char *name, prs_struct *ps, int depth, NTSTATUS *status)
 			SIVAL(q,0,NT_STATUS_V(*status));
 	}
 
-	DEBUG(5,("%s%04x %s: %s\n", tab_depth(depth), ps->data_offset, name, 
+	DEBUG(5,("%s%04x %s: %s\n", tab_depth(5,depth), ps->data_offset, name, 
 		 nt_errstr(*status)));
 
 	ps->data_offset += sizeof(uint32);
@@ -803,7 +803,7 @@ bool prs_dcerpc_status(const char *name, prs_struct *ps, int depth, NTSTATUS *st
 			SIVAL(q,0,NT_STATUS_V(*status));
 	}
 
-	DEBUG(5,("%s%04x %s: %s\n", tab_depth(depth), ps->data_offset, name, 
+	DEBUG(5,("%s%04x %s: %s\n", tab_depth(5,depth), ps->data_offset, name, 
 		 dcerpc_errstr(NT_STATUS_V(*status))));
 
 	ps->data_offset += sizeof(uint32);
@@ -834,7 +834,7 @@ bool prs_werror(const char *name, prs_struct *ps, int depth, WERROR *status)
 			SIVAL(q,0,W_ERROR_V(*status));
 	}
 
-	DEBUG(5,("%s%04x %s: %s\n", tab_depth(depth), ps->data_offset, name, 
+	DEBUG(5,("%s%04x %s: %s\n", tab_depth(5,depth), ps->data_offset, name, 
 		 dos_errstr(*status)));
 
 	ps->data_offset += sizeof(uint32);
@@ -862,7 +862,7 @@ bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint
 			SCVAL(q, i, data8s[i]);
 	}
 
-	DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset ,name));
+	DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset ,name));
 	if (charmode)
 		print_asc(5, (unsigned char*)data8s, len);
 	else {
@@ -905,7 +905,7 @@ bool prs_uint16s(bool charmode, const char *name, prs_struct *ps, int depth, uin
 		}
 	}
 
-	DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
+	DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset, name));
 	if (charmode)
 		print_asc(5, (unsigned char*)data16s, 2*len);
 	else {
@@ -947,7 +947,7 @@ static void dbg_rw_punival(bool charmode, const char *name, int depth, prs_struc
 		}
 	}
 
-	DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
+	DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset, name));
 	if (charmode)
 		print_asc(5, (unsigned char*)out_buf, 2*len);
 	else {
@@ -1002,7 +1002,7 @@ bool prs_uint32s(bool charmode, const char *name, prs_struct *ps, int depth, uin
 		}
 	}
 
-	DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
+	DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset, name));
 	if (charmode)
 		print_asc(5, (unsigned char*)data32s, 4*len);
 	else {
@@ -1103,7 +1103,7 @@ bool prs_string2(bool charmode, const char *name, prs_struct *ps, int depth, STR
 		} else {
 			str->buffer = NULL;
 			/* Return early to ensure Coverity isn't confused. */
-			DEBUG(5,("%s%04x %s: \n", tab_depth(depth), ps->data_offset, name));
+			DEBUG(5,("%s%04x %s: \n", tab_depth(5,depth), ps->data_offset, name));
 			return True;
 		}
 	}
@@ -1116,7 +1116,7 @@ bool prs_string2(bool charmode, const char *name, prs_struct *ps, int depth, STR
 			SCVAL(q, i, str->buffer[i]);
 	}
 
-	DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
+	DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset, name));
 	if (charmode)
 		print_asc(5, (unsigned char*)str->buffer, str->str_str_len);
 	else {
@@ -1252,7 +1252,7 @@ bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str)
 
 		len++;
 
-		DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
+		DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset, name));
 		print_asc(5, (unsigned char*)start, 2*len);	
 		DEBUG(5, ("\n"));
 	}
@@ -1309,7 +1309,7 @@ bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str)
 			str->buffer[len++] = '\0';
 		}
 
-		DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
+		DEBUG(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset, name));
 		print_asc(5, (unsigned char*)str->buffer, 2*len);	
 		DEBUG(5, ("\n"));
 	}
@@ -1544,9 +1544,11 @@ static void schannel_digest(struct schannel_auth_struct *a,
 			  uchar digest_final[16]) 
 {
 	uchar whole_packet_digest[16];
-	static const uchar zeros[4] = { 0, };
+	uchar zeros[4];
 	struct MD5Context ctx3;
-	
+
+	ZERO_STRUCT(zeros);
+
 	/* verfiy the signature on the packet by MD5 over various bits */
 	MD5Init(&ctx3);
 	/* use our sequence number, which ensures the packet is not
@@ -1573,11 +1575,13 @@ static void schannel_get_sealing_key(struct schannel_auth_struct *a,
 				   RPC_AUTH_SCHANNEL_CHK *verf,
 				   uchar sealing_key[16]) 
 {
-	static const uchar zeros[4] = { 0, };
+	uchar zeros[4];
 	uchar digest2[16];
 	uchar sess_kf0[16];
 	int i;
 
+	ZERO_STRUCT(zeros);
+
 	for (i = 0; i < sizeof(sess_kf0); i++) {
 		sess_kf0[i] = a->sess_key[i] ^ 0xf0;
 	}
@@ -1600,10 +1604,12 @@ static void schannel_get_sealing_key(struct schannel_auth_struct *a,
 static void schannel_deal_with_seq_num(struct schannel_auth_struct *a,
 				     RPC_AUTH_SCHANNEL_CHK *verf)
 {
-	static const uchar zeros[4] = { 0, };
+	uchar zeros[4];
 	uchar sequence_key[16];
 	uchar digest1[16];
 
+	ZERO_STRUCT(zeros);
+
 	hmac_md5(a->sess_key, zeros, sizeof(zeros), digest1);
 	dump_data_pw("(sequence key) digest1:\n", digest1, sizeof(digest1));
 
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 614a80dd6f..9924a164a1 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -29,61 +29,6 @@
 #define DBGC_CLASS DBGC_RPC_PARSE
 
 /*******************************************************************
-inits a SAMR_Q_CLOSE_HND structure.
-********************************************************************/
-
-void init_samr_q_close_hnd(SAMR_Q_CLOSE_HND * q_c, POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_close_hnd\n"));
-	
-	q_c->pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_close_hnd(const char *desc, SAMR_Q_CLOSE_HND * q_u,
-			 prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_close_hnd");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	return smb_io_pol_hnd("pol", &q_u->pol, ps, depth);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_close_hnd(const char *desc, SAMR_R_CLOSE_HND * r_u,
-			 prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_close_hnd");
-	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 SAMR_Q_LOOKUP_DOMAIN structure.
 ********************************************************************/
 
@@ -240,74 +185,6 @@ bool samr_io_r_remove_sid_foreign_domain(const char *desc, SAMR_R_REMOVE_SID_FOR
 reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN * q_u,
-			     POLICY_HND *pol, uint32 flags,
-			     const DOM_SID *sid)
-{
-	DEBUG(5, ("samr_init_samr_q_open_domain\n"));
-
-	q_u->pol = *pol;
-	q_u->flags = flags;
-	init_dom_sid2(&q_u->dom_sid, sid);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_open_domain(const char *desc, SAMR_Q_OPEN_DOMAIN * q_u,
-			   prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_open_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
-		return False;
-
-	if(!prs_uint32("flags", ps, depth, &q_u->flags))
-		return False;
-
-	if(!smb_io_dom_sid2("sid", &q_u->dom_sid, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_open_domain(const char *desc, SAMR_R_OPEN_DOMAIN * r_u,
-			   prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_open_domain");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("domain_pol", &r_u->domain_pol, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
 void init_samr_q_get_usrdom_pwinfo(SAMR_Q_GET_USRDOM_PWINFO * q_u,
 				   POLICY_HND *user_pol)
 {
@@ -2172,73 +2049,6 @@ bool samr_io_r_query_dispinfo(const char *desc, SAMR_R_QUERY_DISPINFO * r_u,
 }
 
 /*******************************************************************
-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.
 ********************************************************************/
 
@@ -2518,143 +2328,6 @@ static bool samr_group_info_ctr(const char *desc, GROUP_INFO_CTR **ctr,
 }
 
 /*******************************************************************
-inits a SAMR_Q_CREATE_DOM_GROUP structure.
-********************************************************************/
-
-void init_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP * q_e,
-				  POLICY_HND *pol, const char *acct_desc,
-				  uint32 access_mask)
-{
-	DEBUG(5, ("init_samr_q_create_dom_group\n"));
-
-	q_e->pol = *pol;
-
-	init_unistr2(&q_e->uni_acct_desc, acct_desc, UNI_FLAGS_NONE);
-	init_uni_hdr(&q_e->hdr_acct_desc, &q_e->uni_acct_desc);
-
-	q_e->access_mask = access_mask;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_create_dom_group(const char *desc, SAMR_Q_CREATE_DOM_GROUP * q_e,
-				prs_struct *ps, int depth)
-{
-	if (q_e == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_create_dom_group");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
-		return False;
-
-	if(!smb_io_unihdr("hdr_acct_desc", &q_e->hdr_acct_desc, ps, depth))
-		return False;
-	if(!smb_io_unistr2("uni_acct_desc", &q_e->uni_acct_desc,
-		       q_e->hdr_acct_desc.buffer, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint32("access", ps, depth, &q_e->access_mask))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_create_dom_group(const char *desc, SAMR_R_CREATE_DOM_GROUP * r_u,
-				prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_create_dom_group");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
-		return False;
-
-	if(!prs_uint32("rid   ", ps, depth, &r_u->rid))
-		return False;
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-inits a SAMR_Q_DELETE_DOM_GROUP structure.
-********************************************************************/
-
-void init_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP * q_c,
-				  POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_delete_dom_group\n"));
-
-	q_c->group_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_delete_dom_group(const char *desc, SAMR_Q_DELETE_DOM_GROUP * q_u,
-				prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("group_pol", &q_u->group_pol, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_delete_dom_group(const char *desc, SAMR_R_DELETE_DOM_GROUP * r_u,
-				prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_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 SAMR_Q_DEL_GROUPMEM structure.
 ********************************************************************/
 
@@ -4093,72 +3766,6 @@ bool samr_io_r_query_useraliases(const char *desc, SAMR_R_QUERY_USERALIASES * r_
 }
 
 /*******************************************************************
-inits a SAMR_Q_OPEN_ALIAS structure.
-********************************************************************/
-
-void init_samr_q_open_alias(SAMR_Q_OPEN_ALIAS * q_u, POLICY_HND *pol,
-			    uint32 access_mask, uint32 rid)
-{
-	DEBUG(5, ("init_samr_q_open_alias\n"));
-
-	q_u->dom_pol = *pol;
-	q_u->access_mask = access_mask;
-	q_u->rid_alias = rid;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_open_alias(const char *desc, SAMR_Q_OPEN_ALIAS * q_u,
-			  prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_open_alias");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("domain_pol", &q_u->dom_pol, ps, depth))
-		return False;
-
-	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
-		return False;
-	if(!prs_uint32("rid_alias", ps, depth, &q_u->rid_alias))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_open_alias(const char *desc, SAMR_R_OPEN_ALIAS * r_u,
-			  prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_open_alias");
-	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 SAMR_Q_LOOKUP_RIDS structure.
 ********************************************************************/
 
@@ -4357,141 +3964,6 @@ bool samr_io_r_lookup_rids(const char *desc, SAMR_R_LOOKUP_RIDS * r_u,
 }
 
 /*******************************************************************
-inits a SAMR_Q_OPEN_ALIAS structure.
-********************************************************************/
-
-void init_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS * q_u, POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_delete_alias\n"));
-
-	q_u->alias_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_delete_alias(const char *desc, SAMR_Q_DELETE_DOM_ALIAS * q_u,
-			    prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_delete_alias");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_delete_alias(const char *desc, SAMR_R_DELETE_DOM_ALIAS * r_u,
-			    prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_delete_alias");
-	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 SAMR_Q_CREATE_DOM_ALIAS structure.
-********************************************************************/
-
-void init_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS * q_u,
-				  POLICY_HND *hnd, const char *acct_desc)
-{
-	DEBUG(5, ("init_samr_q_create_dom_alias\n"));
-
-	q_u->dom_pol = *hnd;
-
-	init_unistr2(&q_u->uni_acct_desc, acct_desc, UNI_FLAGS_NONE);
-	init_uni_hdr(&q_u->hdr_acct_desc, &q_u->uni_acct_desc);
-
-	q_u->access_mask = MAXIMUM_ALLOWED_ACCESS;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_create_dom_alias(const char *desc, SAMR_Q_CREATE_DOM_ALIAS * q_u,
-				prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_create_dom_alias");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("dom_pol", &q_u->dom_pol, ps, depth))
-		return False;
-
-	if(!smb_io_unihdr("hdr_acct_desc", &q_u->hdr_acct_desc, ps, depth))
-		return False;
-	if(!smb_io_unistr2("uni_acct_desc", &q_u->uni_acct_desc,
-		       q_u->hdr_acct_desc.buffer, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_create_dom_alias(const char *desc, SAMR_R_CREATE_DOM_ALIAS * r_u,
-				prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_create_dom_alias");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("alias_pol", &r_u->alias_pol, ps, depth))
-		return False;
-
-	if(!prs_uint32("rid", ps, depth, &r_u->rid))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
 inits a SAMR_Q_ADD_ALIASMEM structure.
 ********************************************************************/
 
@@ -4610,77 +4082,6 @@ bool samr_io_r_del_aliasmem(const char *desc, SAMR_R_DEL_ALIASMEM * r_u,
 }
 
 /*******************************************************************
-inits a SAMR_Q_DELETE_DOM_ALIAS structure.
-********************************************************************/
-
-void init_samr_q_delete_dom_alias(SAMR_Q_DELETE_DOM_ALIAS * q_c,
-				  POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_delete_dom_alias\n"));
-
-	q_c->alias_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_delete_dom_alias(const char *desc, SAMR_Q_DELETE_DOM_ALIAS * q_u,
-				prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_alias");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-inits a SAMR_R_DELETE_DOM_ALIAS structure.
-********************************************************************/
-
-void init_samr_r_delete_dom_alias(SAMR_R_DELETE_DOM_ALIAS * r_u,
-				  NTSTATUS status)
-{
-	DEBUG(5, ("init_samr_r_delete_dom_alias\n"));
-
-	r_u->status = status;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_delete_dom_alias(const char *desc, SAMR_R_DELETE_DOM_ALIAS * r_u,
-				prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_alias");
-	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 SAMR_Q_QUERY_ALIASMEM structure.
 ********************************************************************/
 
@@ -5040,215 +4441,6 @@ bool samr_io_r_lookup_names(const char *desc, SAMR_R_LOOKUP_NAMES * r_u,
 }
 
 /*******************************************************************
-inits a SAMR_Q_DELETE_DOM_USER structure.
-********************************************************************/
-
-void init_samr_q_delete_dom_user(SAMR_Q_DELETE_DOM_USER * q_c,
-				 POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_delete_dom_user\n"));
-
-	q_c->user_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_delete_dom_user(const char *desc, SAMR_Q_DELETE_DOM_USER * q_u,
-			       prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_user");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_delete_dom_user(const char *desc, SAMR_R_DELETE_DOM_USER * r_u,
-			       prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_user");
-	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;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-void init_samr_q_open_user(SAMR_Q_OPEN_USER * q_u,
-			   POLICY_HND *pol,
-			   uint32 access_mask, uint32 rid)
-{
-	DEBUG(5, ("samr_init_samr_q_open_user\n"));
-
-	q_u->domain_pol = *pol;
-	q_u->access_mask = access_mask;
-	q_u->user_rid = rid;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_open_user(const char *desc, SAMR_Q_OPEN_USER * q_u,
-			 prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_open_user");
-	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("user_rid ", ps, depth, &q_u->user_rid))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_open_user(const char *desc, SAMR_R_OPEN_USER * r_u,
-			 prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_open_user");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("user_pol", &r_u->user_pol, ps, depth))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-void init_samr_q_create_user(SAMR_Q_CREATE_USER * q_u,
-			     POLICY_HND *pol,
-			     const char *name,
-			     uint32 acb_info, uint32 access_mask)
-{
-	DEBUG(5, ("samr_init_samr_q_create_user\n"));
-
-	q_u->domain_pol = *pol;
-
-	init_unistr2(&q_u->uni_name, name, UNI_FLAGS_NONE);
-	init_uni_hdr(&q_u->hdr_name, &q_u->uni_name);
-
-	q_u->acb_info = acb_info;
-	q_u->access_mask = access_mask;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_create_user(const char *desc, SAMR_Q_CREATE_USER * q_u,
-			   prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_create_user");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
-		return False;
-
-	if(!smb_io_unihdr("hdr_name", &q_u->hdr_name, ps, depth))
-		return False;
-	if(!smb_io_unistr2("uni_name", &q_u->uni_name, q_u->hdr_name.buffer, ps, depth))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint32("acb_info   ", ps, depth, &q_u->acb_info))
-		return False;
-	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_create_user(const char *desc, SAMR_R_CREATE_USER * r_u,
-			   prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_create_user");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("user_pol", &r_u->user_pol, ps, depth))
-		return False;
-
-	if(!prs_uint32("access_granted", ps, depth, &r_u->access_granted))
-		return False;
-	if(!prs_uint32("user_rid ", ps, depth, &r_u->user_rid))
-		return False;
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
 inits a SAMR_Q_QUERY_USERINFO structure.
 ********************************************************************/
 
@@ -7339,77 +6531,6 @@ bool samr_io_r_connect_anon(const char *desc, SAMR_R_CONNECT_ANON * r_u,
 }
 
 /*******************************************************************
-inits a SAMR_Q_GET_DOM_PWINFO structure.
-********************************************************************/
-
-void init_samr_q_get_dom_pwinfo(SAMR_Q_GET_DOM_PWINFO * q_u,
-				char *srv_name)
-{
-	DEBUG(5, ("init_samr_q_get_dom_pwinfo\n"));
-
-	q_u->ptr = 1;
-	init_unistr2(&q_u->uni_srv_name, srv_name, UNI_FLAGS_NONE);
-	init_uni_hdr(&q_u->hdr_srv_name, &q_u->uni_srv_name);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_get_dom_pwinfo(const char *desc, SAMR_Q_GET_DOM_PWINFO * q_u,
-			      prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_q_get_dom_pwinfo");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("ptr", ps, depth, &q_u->ptr))
-		return False;
-	if (q_u->ptr != 0) {
-		if(!smb_io_unihdr("", &q_u->hdr_srv_name, ps, depth))
-			return False;
-		if(!smb_io_unistr2("", &q_u->uni_srv_name, q_u->hdr_srv_name.buffer, ps, depth))
-			return False;
-	}
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_get_dom_pwinfo(const char *desc, SAMR_R_GET_DOM_PWINFO * r_u,
-			      prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "samr_io_r_get_dom_pwinfo");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint16("min_pwd_length", ps, depth, &r_u->min_pwd_length))
-		return False;
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint32("password_properties", ps, depth, &r_u->password_properties))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
 make a SAMR_ENC_PASSWD structure.
 ********************************************************************/
 
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index 6198a78de0..6ea128d3a4 100644
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -291,14 +291,14 @@ bool sec_io_desc(const char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
 
 		if (psd->owner_sid != NULL) {
 			off_owner_sid = offset;
-			offset += sid_size(psd->owner_sid);
+			offset += ndr_size_dom_sid(psd->owner_sid, 0);
 		} else {
 			off_owner_sid = 0;
 		}
 
 		if (psd->group_sid != NULL) {
 			off_grp_sid = offset;
-			offset += sid_size(psd->group_sid);
+			offset += ndr_size_dom_sid(psd->group_sid, 0);
 		} else {
 			off_grp_sid = 0;
 		}
@@ -426,7 +426,7 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int
 	if(!prs_uint32    ("ptr  ", ps, depth, &ptr))
 		return False;
 
-	len = sec_desc_size(psdb->sd);
+	len = ndr_size_security_descriptor(psdb->sd, 0);
 	if(!prs_uint32_pre("len    ", ps, depth, &len, &off_len))
 		return False;
 
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index ea76c57045..3bf8ef27c1 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -3098,7 +3098,7 @@ uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info)
 		
 	size += 4;
 	
-	size += sec_desc_size( info->secdesc );
+	size += ndr_size_security_descriptor( info->secdesc, 0 );
 
 	size+=size_of_device_mode( info->devmode );
 	
@@ -3185,7 +3185,7 @@ return the size required by a struct in the stream
 uint32 spoolss_size_printer_info_3(PRINTER_INFO_3 *info)
 {
 	/* The 8 is for the self relative pointer - 8 byte aligned.. */
-	return 8 + (uint32)sec_desc_size( info->secdesc );
+	return 8 + (uint32)ndr_size_security_descriptor( info->secdesc, 0 );
 }
 
 /*******************************************************************
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index e7a73183f5..954aa80600 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -507,7 +507,8 @@ static bool srv_io_share_info502_str(const char *desc, SH_INFO_502_STR *sh502, p
 
 		if(UNMARSHALLING(ps)) {
 
-			sh502->ptrs->sd_size = sh502->sd_size = sec_desc_size(sh502->sd);
+			sh502->ptrs->sd_size = sh502->sd_size =
+				ndr_size_security_descriptor(sh502->sd, 0);
 
 			prs_set_offset(ps, old_offset + sh502->reserved);
 		}
@@ -1018,7 +1019,7 @@ static bool srv_io_srv_share_ctr(const char *desc, SRV_SHARE_INFO_CTR *ctr, prs_
 
 	default:
 		DEBUG(5,("%s no share info at switch_value %d\n",
-			 tab_depth(depth), ctr->switch_value));
+			 tab_depth(5,depth), ctr->switch_value));
 		break;
 	}
 
@@ -1267,7 +1268,7 @@ static bool srv_io_srv_share_info(const char *desc, prs_struct *ps, int depth, S
 				return False;
 		default:
 		        DEBUG(5,("%s no share info at switch_value %d\n",
-			         tab_depth(depth), r_n->switch_value));
+			         tab_depth(5,depth), r_n->switch_value));
 			break;
 		}
 	}
@@ -1460,7 +1461,7 @@ void init_srv_q_net_share_add(SRV_Q_NET_SHARE_ADD *q, const char *srvname,
 {
 	switch(level) {
 	case 502: {
-		size_t sd_size = sec_desc_size(sd);
+		size_t sd_size = ndr_size_security_descriptor(sd, 0);
 		q->ptr_srv_name = 1;
 		init_unistr2(&q->uni_srv_name, srvname, UNI_STR_TERMINATE);
 		q->info.switch_value = q->info_level = level;
@@ -1796,7 +1797,7 @@ static bool srv_io_srv_sess_ctr(const char *desc, SRV_SESS_INFO_CTR **pp_ctr, pr
 			break;
 		default:
 			DEBUG(5,("%s no session info at switch_value %d\n",
-			         tab_depth(depth), ctr->switch_value));
+			         tab_depth(5,depth), ctr->switch_value));
 			break;
 		}
 	}
@@ -2216,7 +2217,7 @@ static bool srv_io_srv_conn_ctr(const char *desc, SRV_CONN_INFO_CTR **pp_ctr, pr
 			break;
 		default:
 			DEBUG(5,("%s no connection info at switch_value %d\n",
-			         tab_depth(depth), ctr->switch_value));
+			         tab_depth(5,depth), ctr->switch_value));
 			break;
 		}
 	}
@@ -2486,7 +2487,7 @@ static bool srv_io_srv_file_ctr(const char *desc, SRV_FILE_INFO_CTR *ctr, prs_st
 		break;
 	}
 	default:
-		DEBUG(5,("%s no file info at switch_value %d\n", tab_depth(depth), ctr->level));
+		DEBUG(5,("%s no file info at switch_value %d\n", tab_depth(5,depth), ctr->level));
 		break;
 	}
 			
@@ -2839,7 +2840,7 @@ static bool srv_io_info_ctr(const char *desc, SRV_INFO_CTR *ctr, prs_struct *ps,
 			break;
 		default:
 			DEBUG(5,("%s no server info at switch_value %d\n",
-					 tab_depth(depth), ctr->switch_value));
+					 tab_depth(5,depth), ctr->switch_value));
 			break;
 		}
 		if(!prs_align(ps))