Merge of new 2.2 code into HEAD (Gerald I hate you :-) :-). Allows new SAMR

RPC code to merge with new passdb code.
Currently rpcclient doesn't compile. I'm working on it...
Jeremy.
(This used to be commit 0be41d5158ea4e645e93e8cd30617c038416e549)

1 files changed, 4112 insertions, 2168 deletions

diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 462c9ed199..5cfa84ff3d 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -1,11 +1,12 @@
-#define OLD_NTDOMAIN 1
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
  *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
+ *  Copyright (C) Andrew Tridgell              1992-2000,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+ *  Copyright (C) Paul Ashton                  1997-2000,
+ *  Copyright (C) Elrond                            2000,
+ *  Copyright (C) Jeremy Allison                    2001
  *  
  *  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
@@ -22,26 +23,31 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+
 #include "includes.h"
+#include "rpc_parse.h"
+#include "rpc_client.h"
+#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
 /*******************************************************************
- Inits a SAMR_Q_CLOSE_HND structure.
+inits a SAMR_Q_CLOSE_HND structure.
 ********************************************************************/
 
-void init_samr_q_close_hnd(SAMR_Q_CLOSE_HND *q_c, POLICY_HND *hnd)
+void init_samr_q_close_hnd(SAMR_Q_CLOSE_HND * q_c, POLICY_HND *hnd)
 {
-	DEBUG(5,("init_samr_q_close_hnd\n"));
-
-	memcpy(&q_c->pol, hnd, sizeof(q_c->pol));
+	DEBUG(5, ("init_samr_q_close_hnd\n"));
+	
+	q_c->pol = *hnd;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_close_hnd(char *desc,  SAMR_Q_CLOSE_HND *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_close_hnd(char *desc, SAMR_Q_CLOSE_HND * q_u,
+			 prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
@@ -52,19 +58,15 @@ BOOL samr_io_q_close_hnd(char *desc,  SAMR_Q_CLOSE_HND *q_u, prs_struct *ps, int
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
-	return True;
+	return smb_io_pol_hnd("pol", &q_u->pol, ps, depth);
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_close_hnd(char *desc, SAMR_R_CLOSE_HND * r_u,
+			 prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
@@ -77,8 +79,6 @@ BOOL samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int
 
 	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
-		return False;
 
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
@@ -86,74 +86,93 @@ BOOL samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int
 	return True;
 }
 
-
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_Q_LOOKUP_DOMAIN structure.
 ********************************************************************/
 
-void init_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u, 
-			     POLICY_HND *connect_pol, 
-			     uint32 access_mask, DOM_SID *sid)
+void init_samr_q_lookup_domain(SAMR_Q_LOOKUP_DOMAIN * q_u,
+			       POLICY_HND *pol, char *dom_name)
 {
-	DEBUG(5,("samr_init_q_open_domain\n"));
+	int len_name = strlen(dom_name);
 
-	q_u->pol = *connect_pol;
-	q_u->access_mask = access_mask;
-	init_dom_sid2(&q_u->dom_sid, sid);
+	DEBUG(5, ("init_samr_q_lookup_domain\n"));
+
+	q_u->connect_pol = *pol;
+
+	init_uni_hdr(&q_u->hdr_domain, len_name);
+	init_unistr2(&q_u->uni_domain, dom_name, len_name);
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
-
-BOOL samr_io_q_open_domain(char *desc, SAMR_Q_OPEN_DOMAIN *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_lookup_domain(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_open_domain");
+	prs_debug(ps, depth, desc, "samr_io_q_lookup_domain");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
+	if(!smb_io_pol_hnd("connect_pol", &q_u->connect_pol, ps, depth))
 		return False;
 
-	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
+	if(!smb_io_unihdr("hdr_domain", &q_u->hdr_domain, ps, depth))
 		return False;
 
-	if(!smb_io_dom_sid2("sid", &q_u->dom_sid, ps, depth))
-		return False;
-	if(!prs_align(ps))
+	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, uint32 status)
+{
+	DEBUG(5, ("init_samr_r_lookup_domain\n"));
+
+	r_u->status = status;
+	r_u->ptr_sid = 0;
+	if (status == 0x0) {
+		r_u->ptr_sid = 1;
+		init_dom_sid2(&r_u->dom_sid, dom_sid);
+	}
+}
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_open_domain(char *desc, SAMR_R_OPEN_DOMAIN *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_lookup_domain(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_open_domain");
+	prs_debug(ps, depth, desc, "samr_io_r_lookup_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_align(ps))
+	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_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -161,34 +180,39 @@ BOOL samr_io_r_open_domain(char *desc, SAMR_R_OPEN_DOMAIN *r_u, prs_struct *ps,
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_unknown_2c(SAMR_Q_UNKNOWN_2C *q_u, POLICY_HND *user_pol)
+void init_samr_q_unknown_2d(SAMR_Q_UNKNOWN_2D * q_u, POLICY_HND *dom_pol, DOM_SID *sid)
 {
-	DEBUG(5,("samr_init_q_unknown_2c\n"));
+	DEBUG(5, ("samr_init_samr_q_unknown_2d\n"));
 
-	memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
+	q_u->dom_pol = *dom_pol;
+	init_dom_sid2(&q_u->sid, sid);
 }
 
-
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_unknown_2c(char *desc,  SAMR_Q_UNKNOWN_2C *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_unknown_2d(char *desc, SAMR_Q_UNKNOWN_2D * q_u,
+			  prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_unknown_2c");
+	prs_debug(ps, depth, desc, "samr_io_q_unknown_2d");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth))
+	if(!smb_io_pol_hnd("domain_pol", &q_u->dom_pol, ps, depth))
+		return False;
+
+	if(!smb_io_dom_sid2("sid", &q_u->sid, ps, depth))
 		return False;
+
 	if(!prs_align(ps))
 		return False;
 
@@ -196,282 +220,263 @@ BOOL samr_io_q_unknown_2c(char *desc,  SAMR_Q_UNKNOWN_2C *q_u, prs_struct *ps, i
 }
 
 /*******************************************************************
- Inits a structure.
-********************************************************************/
-
-void init_samr_r_unknown_2c(SAMR_R_UNKNOWN_2C *q_u, uint32 status)
-{
-	DEBUG(5,("samr_init_r_unknown_2c\n"));
-
-	q_u->unknown_0 = 0x00160000;
-	q_u->unknown_1 = 0x00000000;
-	q_u->status    = status;
-}
-
-
-/*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_unknown_2c(char *desc,  SAMR_R_UNKNOWN_2C *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_unknown_2d(char *desc, SAMR_R_UNKNOWN_2D * r_u,
+			  prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_unknown_2c");
+	prs_debug(ps, depth, desc, "samr_io_r_unknown_2d");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("unknown_0", ps, depth, &r_u->unknown_0))
-		return False;
-	if(!prs_uint32("unknown_1", ps, depth, &r_u->unknown_1))
-		return False;
-	if(!prs_uint32("status   ", ps, depth, &r_u->status))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_Q_UNKNOWN_3 structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
-				POLICY_HND *user_pol, uint16 switch_value)
+void init_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN * q_u,
+			     POLICY_HND *pol, uint32 flags,
+			     DOM_SID *sid)
 {
-	DEBUG(5,("samr_init_q_unknown_3\n"));
+	DEBUG(5, ("samr_init_samr_q_open_domain\n"));
 
-	memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
-	q_u->switch_value = switch_value;
+	q_u->pol = *pol;
+	q_u->flags = flags;
+	init_dom_sid2(&q_u->dom_sid, sid);
 }
 
-
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_unknown_3(char *desc,  SAMR_Q_UNKNOWN_3 *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_open_domain(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_unknown_3");
+	prs_debug(ps, depth, desc, "samr_io_q_open_domain");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth))
+	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
 		return False;
 
-	if(!prs_align(ps))
+	if(!prs_uint32("flags", ps, depth, &q_u->flags))
 		return False;
 
-	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
+	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(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_uint32("status", ps, depth, &r_u->status))
+		return False;
+
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_Q_QUERY_DOMAIN_INFO structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
-				POLICY_HND *domain_pol, uint16 switch_value)
+void init_samr_q_get_usrdom_pwinfo(SAMR_Q_GET_USRDOM_PWINFO * q_u,
+				   POLICY_HND *user_pol)
 {
-	DEBUG(5,("init_samr_q_query_dom_info\n"));
+	DEBUG(5, ("samr_init_samr_q_get_usrdom_pwinfo\n"));
 
-	memcpy(&q_u->domain_pol, domain_pol, sizeof(q_u->domain_pol));
-	q_u->switch_value = switch_value;
+	q_u->user_pol = *user_pol;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_get_usrdom_pwinfo(char *desc, SAMR_Q_GET_USRDOM_PWINFO * q_u,
+				 prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_query_dom_info");
+	prs_debug(ps, depth, desc, "samr_io_q_get_usrdom_pwinfo");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
-		return False;
-
-	return True;
+	return smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth);
 }
 
 /*******************************************************************
-Inits a structure.
+ Init.
 ********************************************************************/
-BOOL init_unk_info1(SAM_UNK_INFO_1 *u_1)
-{
-	if (u_1 == NULL)
-		return False;
 
-	memset(u_1->padding, 0, sizeof(u_1->padding));	/* 12 bytes zeros */
-	u_1->unknown_1 = 0x80000000;
-	u_1->unknown_2 = 0x00000000;
+void init_samr_r_get_usrdom_pwinfo(SAMR_R_GET_USRDOM_PWINFO *r_u, uint32 status)
+{
+	DEBUG(5, ("init_samr_r_get_usrdom_pwinfo\n"));
+	
+	r_u->unknown_0 = 0x0000;
+    r_u->unknown_1 = 0x0015;
+    r_u->unknown_2 = 0x00000000;
 
-	return True;
+	r_u->status = status;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 *u_1, prs_struct *ps, int depth)
+
+BOOL samr_io_r_get_usrdom_pwinfo(char *desc, SAMR_R_GET_USRDOM_PWINFO * r_u,
+				 prs_struct *ps, int depth)
 {
-	if (u_1 == NULL)
+	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_unk_info1");
+	prs_debug(ps, depth, desc, "samr_io_r_get_usrdom_pwinfo");
 	depth++;
 
-	if(!prs_uint8s(False, "padding", ps, depth, u_1->padding, sizeof(u_1->padding)))
+	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("unknown_1", ps, depth, &u_1->unknown_1))	/* 0x8000 0000 */
+	if(!prs_uint16("unknown_0", ps, depth, &r_u->unknown_0))
 		return False;
-	if(!prs_uint32("unknown_2", ps, depth, &u_1->unknown_2))	/* 0x0000 0000 */
+	if(!prs_uint16("unknown_1", ps, depth, &r_u->unknown_1))
 		return False;
-
-	if(!prs_align(ps))
+	if(!prs_uint32("unknown_2", ps, depth, &r_u->unknown_2))
+		return False;
+	if(!prs_uint32("status   ", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
+void init_samr_q_query_sec_obj(SAMR_Q_QUERY_SEC_OBJ * q_u,
+			       POLICY_HND *user_pol, uint32 sec_info)
 {
-	int len_domain = strlen(domain)+1;
-	int len_server = strlen(server)+1;
-
-	u_2->unknown_0 = 0x00000000;
-	u_2->unknown_1 = 0x80000000;
-	u_2->unknown_2 = 0x00000000;
-
-	u_2->ptr_0 = 1;
-	init_uni_hdr(&u_2->hdr_domain, len_domain);
-	init_uni_hdr(&u_2->hdr_server, len_server);
+	DEBUG(5, ("samr_init_samr_q_query_sec_obj\n"));
 
-	u_2->seq_num = 0x10000000;
-	u_2->unknown_3 = 0x00000000;
-	
-	u_2->unknown_4  = 0x00000001;
-	u_2->unknown_5  = 0x00000003;
-	u_2->unknown_6  = 0x00000001;
-	u_2->num_domain_usrs  = 0x00000008;
-	u_2->num_domain_grps = 0x00000003;
-	u_2->num_local_grps = 0x00000003;
-
-	memset(u_2->padding, 0, sizeof(u_2->padding)); /* 12 bytes zeros */
-
-	init_unistr2(&u_2->uni_domain, domain, len_domain);
-	init_unistr2(&u_2->uni_server, server, len_server);
+	q_u->user_pol = *user_pol;
+	q_u->sec_info = sec_info;
 }
 
+
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 *u_2, prs_struct *ps, int depth)
+BOOL samr_io_q_query_sec_obj(char *desc, SAMR_Q_QUERY_SEC_OBJ * q_u,
+			     prs_struct *ps, int depth)
 {
-	if (u_2 == NULL)
+	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_unk_info2");
+	prs_debug(ps, depth, desc, "samr_io_q_query_sec_obj");
 	depth++;
 
-	if(!prs_uint32("unknown_0", ps, depth, &u_2->unknown_0)) /* 0x0000 0000 */
-		return False;
-	if(!prs_uint32("unknown_1", ps, depth, &u_2->unknown_1)) /* 0x8000 0000 */
-		return False;
-	if(!prs_uint32("unknown_2", ps, depth, &u_2->unknown_2)) /* 0x0000 0000 */
+	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr_0", ps, depth, &u_2->ptr_0))     /* pointer to unknown structure */
-		return False;
-	if(!smb_io_unihdr("hdr_domain", &u_2->hdr_domain, ps, depth)) /* domain name unicode header */
+	if(!smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth))
 		return False;
-	if(!smb_io_unihdr("hdr_server", &u_2->hdr_server, ps, depth)) /* server name unicode header */
+
+	if(!prs_uint32("sec_info", ps, depth, &q_u->sec_info))
 		return False;
 
-	/* put all the data in here, at the moment, including what the above
-	   pointer is referring to
-	 */
+	return True;
+}
 
-	if(!prs_uint32("seq_num ", ps, depth, &u_2->seq_num )) /* 0x0000 0099 or 0x1000 0000 */
-		return False;
-	if(!prs_uint32("unknown_3 ", ps, depth, &u_2->unknown_3 )) /* 0x0000 0000 */
-		return False;
-	
-	if(!prs_uint32("unknown_4 ", ps, depth, &u_2->unknown_4 )) /* 0x0000 0001 */
-		return False;
-	if(!prs_uint32("unknown_5 ", ps, depth, &u_2->unknown_5 )) /* 0x0000 0003 */
-		return False;
-	if(!prs_uint32("unknown_6 ", ps, depth, &u_2->unknown_6 )) /* 0x0000 0001 */
-		return False;
-	if(!prs_uint32("num_domain_usrs ", ps, depth, &u_2->num_domain_usrs )) /* 0x0000 0008 */
-		return False;
-	if(!prs_uint32("num_domain_grps", ps, depth, &u_2->num_domain_grps)) /* 0x0000 0003 */
-		return False;
-	if(!prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps)) /* 0x0000 0003 */
-		return False;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-	if(!prs_uint8s(False, "padding", ps, depth, u_2->padding, sizeof(u_2->padding))) /* 12 bytes zeros */
-		return False;
+void init_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO * q_u,
+				POLICY_HND *domain_pol, uint16 switch_value)
+{
+	DEBUG(5, ("samr_init_samr_q_query_dom_info\n"));
 
-	if(!smb_io_unistr2( "uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer, ps, depth)) /* domain name unicode string */
+	q_u->domain_pol = *domain_pol;
+	q_u->switch_value = switch_value;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_query_dom_info(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_dom_info");
+	depth++;
+
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_unistr2( "uni_server", &u_2->uni_server, u_2->hdr_server.buffer, ps, depth)) /* server name unicode string */
+	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
 		return False;
 
-	if(!prs_align(ps))
+	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
 		return False;
 
 	return True;
 }
 
+
 /*******************************************************************
-Inits a structure.
+inits a structure.
 ********************************************************************/
-BOOL init_unk_info3(SAM_UNK_INFO_3 * u_3)
-{
-	if (u_3 == NULL)
-		return False;
 
+void init_unk_info3(SAM_UNK_INFO_3 * u_3)
+{
 	u_3->unknown_0 = 0x00000000;
 	u_3->unknown_1 = 0x80000000;
-
-	return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 *u_3, prs_struct *ps, int depth)
+
+static BOOL sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 * u_3,
+			     prs_struct *ps, int depth)
 {
 	if (u_3 == NULL)
 		return False;
@@ -484,31 +489,26 @@ static BOOL sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 *u_3, prs_struct *ps, in
 	if(!prs_uint32("unknown_1", ps, depth, &u_3->unknown_1))	/* 0x8000 0000 */
 		return False;
 
-	if(!prs_align(ps))
-		return False;
-
 	return True;
 }
 
 /*******************************************************************
-Inits a structure.
+inits a structure.
 ********************************************************************/
-BOOL init_unk_info6(SAM_UNK_INFO_6 * u_6)
-{
-	if (u_6 == NULL)
-		return False;
 
+void init_unk_info6(SAM_UNK_INFO_6 * u_6)
+{
 	u_6->unknown_0 = 0x00000000;
 	u_6->ptr_0 = 1;
 	memset(u_6->padding, 0, sizeof(u_6->padding));	/* 12 bytes zeros */
-
-	return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 *u_6, prs_struct *ps, int depth)
+
+static BOOL sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 * u_6,
+			     prs_struct *ps, int depth)
 {
 	if (u_6 == NULL)
 		return False;
@@ -516,36 +516,31 @@ static BOOL sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 *u_6, prs_struct *ps, in
 	prs_debug(ps, depth, desc, "sam_io_unk_info6");
 	depth++;
 
-	if(!prs_uint32("unknown_0", ps, depth, &u_6->unknown_0))	/* 0x0000 0000 */
+	if(!prs_uint32("unknown_0", ps, depth, &u_6->unknown_0)) /* 0x0000 0000 */
 		return False;
-	if(!prs_uint32("ptr_0", ps, depth, &u_6->ptr_0))	/* pointer to unknown structure */
+	if(!prs_uint32("ptr_0", ps, depth, &u_6->ptr_0)) /* pointer to unknown structure */
 		return False;
 	if(!prs_uint8s(False, "padding", ps, depth, u_6->padding, sizeof(u_6->padding)))	/* 12 bytes zeros */
 		return False;
 
-	if(!prs_align(ps))
-		return False;
-
 	return True;
 }
 
 /*******************************************************************
-Inits a structure.
+inits a structure.
 ********************************************************************/
-BOOL init_unk_info7(SAM_UNK_INFO_7 *u_7)
-{
-	if (u_7 == NULL)
-		return False;
 
+void init_unk_info7(SAM_UNK_INFO_7 * u_7)
+{
 	u_7->unknown_0 = 0x0003;
-
-	return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 *u_7, prs_struct *ps, int depth)
+
+static BOOL sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 * u_7,
+			     prs_struct *ps, int depth)
 {
 	if (u_7 == NULL)
 		return False;
@@ -553,37 +548,32 @@ static BOOL sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 *u_7, prs_struct *ps, in
 	prs_debug(ps, depth, desc, "sam_io_unk_info7");
 	depth++;
 
-	if(!prs_uint16("unknown_0", ps, depth, &u_7->unknown_0))	/* 0x0003 */
-		return False;
-	if(!prs_align(ps))
+	if(!prs_uint16("unknown_0", ps, depth, &u_7->unknown_0)) /* 0x0003 */
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
-Inits a structure.
+inits a structure.
 ********************************************************************/
-BOOL init_unk_info12(SAM_UNK_INFO_12 * u_12)
-{
-	if (u_12 == NULL)
-		return False;
 
+void init_unk_info12(SAM_UNK_INFO_12 * u_12)
+{
 	u_12->unknown_0 = 0xcf1dcc00;
 	u_12->unknown_1 = 0xfffffffb;
 	u_12->unknown_2 = 0xcf1dcc00;
 	u_12->unknown_3 = 0xfffffffb;
 
 	u_12->unknown_4 = 0x8a880000;
-
-	return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
+
 static BOOL sam_io_unk_info12(char *desc, SAM_UNK_INFO_12 * u_12,
-			     prs_struct *ps, int depth)
+			      prs_struct *ps, int depth)
 {
 	if (u_12 == NULL)
 		return False;
@@ -602,323 +592,247 @@ static BOOL sam_io_unk_info12(char *desc, SAM_UNK_INFO_12 * u_12,
 	if(!prs_uint32("unknown_4", ps, depth, &u_12->unknown_4))
 		return False;
 
-	if(!prs_align(ps))
-		return False;
-
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_QUERY_DOMAIN_INFO structure.
+inits a structure.
 ********************************************************************/
-
-void init_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO *r_u, 
-				uint16 switch_value, SAM_UNK_CTR *ctr,
-				uint32 status)
+void init_unk_info2(SAM_UNK_INFO_2 * u_2,
+			char *domain, char *server,
+			uint32 seq_num)
 {
-	DEBUG(5,("init_samr_r_query_dom_info\n"));
+	int len_domain = strlen(domain);
+	int len_server = strlen(server);
 
-	r_u->ptr_0 = 0;
-	r_u->switch_value = 0;
-	r_u->status = status; /* return status */
+	u_2->unknown_0 = 0x00000000;
+	u_2->unknown_1 = 0x80000000;
+	u_2->unknown_2 = 0x00000000;
 
-	if (status == 0) {
-		r_u->switch_value = switch_value;
-		r_u->ptr_0 = 1;
-		r_u->ctr = ctr;
-	}
+	u_2->ptr_0 = 1;
+	init_uni_hdr(&u_2->hdr_domain, len_domain);
+	init_uni_hdr(&u_2->hdr_server, len_server);
+
+	u_2->seq_num = seq_num;
+	u_2->unknown_3 = 0x00000000;
+
+	u_2->unknown_4 = 0x00000001;
+	u_2->unknown_5 = 0x00000003;
+	u_2->unknown_6 = 0x00000001;
+	u_2->num_domain_usrs = MAX_SAM_ENTRIES;
+	u_2->num_domain_grps = MAX_SAM_ENTRIES;
+	u_2->num_local_grps = MAX_SAM_ENTRIES;
+
+	memset(u_2->padding, 0, sizeof(u_2->padding));	/* 12 bytes zeros */
+
+	init_unistr2(&u_2->uni_domain, domain, len_domain);
+	init_unistr2(&u_2->uni_server, server, len_server);
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 * u_2,
+			     prs_struct *ps, int depth)
 {
-	if (r_u == NULL)
+	if (u_2 == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_query_dom_info");
+	prs_debug(ps, depth, desc, "sam_io_unk_info2");
 	depth++;
 
-	if(!prs_align(ps))
+	if(!prs_uint32("unknown_0", ps, depth, &u_2->unknown_0)) /* 0x0000 0000 */
 		return False;
-
-	if(!prs_uint32("ptr_0       ", ps, depth, &r_u->ptr_0))
+	if(!prs_uint32("unknown_1", ps, depth, &u_2->unknown_1)) /* 0x8000 0000 */
 		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 0x01:
-			if(!sam_io_unk_info1("unk_inf1", &r_u->ctr->info.inf1, 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 0x03:
-			if(!sam_io_unk_info3("unk_inf3", &r_u->ctr->info.inf3, 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 0x07:
-			if(!sam_io_unk_info7("unk_inf7", &r_u->ctr->info.inf7, ps, depth))
-				return False;
-			break;
-		case 0x0c:
-			if(!sam_io_unk_info12("unk_inf12", &r_u->ctr->info.inf12, ps, depth))
-				return False;
-			break;
-		default:
-			DEBUG(3,("samr_io_r_query_dom_info: unknown switch level 0x%x\n",
-			          r_u->switch_value));
-			return False;
-		}
-	}
-
-	if(!prs_uint32("status", ps, depth, &r_u->status))
+	if(!prs_uint32("unknown_2", ps, depth, &u_2->unknown_2))	/* 0x0000 0000 */
 		return False;
 
-	return True;
-}
-
-
-/*******************************************************************
- Inits a DOM_SID3 structure.
- Calculate length by adding up the size of the components.
- ********************************************************************/
-
-void init_dom_sid3(DOM_SID3 *sid3, uint16 unk_0, uint16 unk_1, DOM_SID *sid)
-{
-	sid3->sid = *sid;
-	sid3->len = 2 + 8 + sid3->sid.num_auths * 4;
-}
-
-/*******************************************************************
- Reads or writes a SAM_SID3 structure.
-
- this one's odd, because the length (in bytes) is specified at the beginning.
- the length _includes_ the length of the length, too :-)
+	if(!prs_uint32("ptr_0", ps, depth, &u_2->ptr_0))
+		return False;
+	if(!smb_io_unihdr("hdr_domain", &u_2->hdr_domain, ps, depth))
+		return False;
+	if(!smb_io_unihdr("hdr_server", &u_2->hdr_server, ps, depth))
+		return False;
 
-********************************************************************/
+	/* put all the data in here, at the moment, including what the above
+	   pointer is referring to
+	 */
 
-static BOOL sam_io_dom_sid3(char *desc,  DOM_SID3 *sid3, prs_struct *ps, int depth)
-{
-	if (sid3 == NULL)
+	if(!prs_uint32("seq_num ", ps, depth, &u_2->seq_num))	/* 0x0000 0099 or 0x1000 0000 */
+		return False;
+	if(!prs_uint32("unknown_3 ", ps, depth, &u_2->unknown_3))	/* 0x0000 0000 */
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_dom_sid3");
-	depth++;
+	if(!prs_uint32("unknown_4 ", ps, depth, &u_2->unknown_4)) /* 0x0000 0001 */
+		return False;
+	if(!prs_uint32("unknown_5 ", ps, depth, &u_2->unknown_5)) /* 0x0000 0003 */
+		return False;
+	if(!prs_uint32("unknown_6 ", ps, depth, &u_2->unknown_6)) /* 0x0000 0001 */
+		return False;
+	if(!prs_uint32("num_domain_usrs ", ps, depth, &u_2->num_domain_usrs))
+		return False;
+	if(!prs_uint32("num_domain_grps", ps, depth, &u_2->num_domain_grps))
+		return False;
+	if(!prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps))
+		return False;
 
-	if(!prs_uint16("len", ps, depth, &sid3->len))
+	if(!prs_uint8s(False, "padding", ps, depth, u_2->padding,sizeof(u_2->padding)))
 		return False;
-	if(!prs_align(ps))
+
+	if(!smb_io_unistr2("uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer, ps, depth))
 		return False;
-	if(!smb_io_dom_sid("", &sid3->sid, ps, depth))
+	if(!smb_io_unistr2("uni_server", &u_2->uni_server, u_2->hdr_server.buffer, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_UNKNOWN3 structure.
-
-unknown_2   : 0x0001
-unknown_3   : 0x8004
-
-unknown_4,5 : 0x0000 0014
-
-unknown_6   : 0x0002
-unknown_7   : 0x5800 or 0x0070
-
+inits a structure.
 ********************************************************************/
 
-static void init_sam_sid_stuff(SAM_SID_STUFF *stf,
-				uint16 unknown_2, uint16 unknown_3,
-				uint32 unknown_4, uint16 unknown_6, uint16 unknown_7,
-				int num_sid3s, DOM_SID3 sid3[MAX_SAM_SIDS])
+void init_unk_info1(SAM_UNK_INFO_1 * u_1)
 {
-	stf->unknown_2 = unknown_2;
-	stf->unknown_3 = unknown_3;
-
-	memset((char *)stf->padding1, '\0', sizeof(stf->padding1));
-
-	stf->unknown_4 = unknown_4;
-	stf->unknown_5 = unknown_4;
-
-	stf->unknown_6 = unknown_6;
-	stf->unknown_7 = unknown_7;
-
-	stf->num_sids  = num_sid3s;
-
-	stf->padding2  = 0x0000;
-
-	memcpy(stf->sid, sid3, sizeof(DOM_SID3) * num_sid3s);
+	memset(u_1->padding, 0, sizeof(u_1->padding));	/* 12 bytes zeros */
+	u_1->unknown_1 = 0x80000000;
+	u_1->unknown_2 = 0x00000000;
 }
 
 /*******************************************************************
- Reads or writes a SAM_SID_STUFF structure.
+reads or writes a structure.
 ********************************************************************/
 
-static BOOL sam_io_sid_stuff(char *desc,  SAM_SID_STUFF *stf, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 * u_1,
+			     prs_struct *ps, int depth)
 {
-	int i;
-
-	if (stf == NULL)
-		return False;
-
-	DEBUG(5,("init_sam_sid_stuff\n"));
+	if (u_1 == NULL)
+	  return False;
 
-	if(!prs_uint16("unknown_2", ps, depth, &stf->unknown_2))
-		return False;
-	if(!prs_uint16("unknown_3", ps, depth, &stf->unknown_3))
-		return False;
+	prs_debug(ps, depth, desc, "sam_io_unk_info1");
+	depth++;
 
-	if(!prs_uint8s(False, "padding1", ps, depth, stf->padding1, sizeof(stf->padding1)))
+	if(!prs_uint8s(False, "padding", ps, depth, u_1->padding, sizeof(u_1->padding)))
 		return False;
 	
-	if(!prs_uint32("unknown_4", ps, depth, &stf->unknown_4))
-		return False;
-	if(!prs_uint32("unknown_5", ps, depth, &stf->unknown_5))
+	if(!prs_uint32("unknown_1", ps, depth, &u_1->unknown_1)) /* 0x8000 0000 */
 		return False;
-	if(!prs_uint16("unknown_6", ps, depth, &stf->unknown_6))
-		return False;
-	if(!prs_uint16("unknown_7", ps, depth, &stf->unknown_7))
+	if(!prs_uint32("unknown_2", ps, depth, &u_1->unknown_2)) /* 0x0000 0000 */
 		return False;
 
-	if(!prs_uint32("num_sids ", ps, depth, &stf->num_sids ))
-		return False;
-	if(!prs_uint16("padding2 ", ps, depth, &stf->padding2 ))
-		return False;
-
-	SMB_ASSERT_ARRAY(stf->sid, stf->num_sids);
-
-	for (i = 0; i < stf->num_sids; i++) {
-		if(!sam_io_dom_sid3("", &(stf->sid[i]), ps, depth))
-			return False;
-	}
-
 	return True;
 }
 
 /*******************************************************************
- Inits or writes a SAMR_R_UNKNOWN3 structure.
+inits a SAMR_R_QUERY_DOMAIN_INFO structure.
 ********************************************************************/
 
-void init_samr_r_unknown_3(SAMR_R_UNKNOWN_3 *r_u,
-				uint16 unknown_2, uint16 unknown_3,
-				uint32 unknown_4, uint16 unknown_6, uint16 unknown_7,
-				int num_sid3s, DOM_SID3 sid3[MAX_SAM_SIDS],
+void init_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO * r_u,
+				uint16 switch_value, SAM_UNK_CTR * ctr,
 				uint32 status)
 {
-	DEBUG(5,("samr_init_r_unknown_3\n"));
+	DEBUG(5, ("init_samr_r_query_dom_info\n"));
 
 	r_u->ptr_0 = 0;
-	r_u->ptr_1 = 0;
+	r_u->switch_value = 0;
+	r_u->status = status;	/* return status */
 
-	if (status == 0x0) {
+	if (status == 0) {
+		r_u->switch_value = switch_value;
 		r_u->ptr_0 = 1;
-		r_u->ptr_1 = 1;
-		init_sam_sid_stuff(&(r_u->sid_stuff), unknown_2, unknown_3,
-	               unknown_4, unknown_6, unknown_7,
-	               num_sid3s, sid3);
+		r_u->ctr = ctr;
 	}
-
-	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a SAMR_R_UNKNOWN_3 structure.
-
-this one's odd, because the daft buggers use a different mechanism
-for writing out the array of sids. they put the number of sids in
-only one place: they've calculated the length of each sid and jumped
-by that amount.  then, retrospectively, the length of the whole buffer
-is put at the beginning of the data stream.
-
-wierd.  
-
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_unknown_3(char *desc,  SAMR_R_UNKNOWN_3 *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO * r_u,
+			      prs_struct *ps, int depth)
 {
-	int ptr_len0=0;
-	int ptr_len1=0;
-	int ptr_sid_stuff = 0;
-
-	if (r_u == NULL)
+        if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_unknown_3");
+	prs_debug(ps, depth, desc, "samr_io_r_query_dom_info");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr_0         ", ps, depth, &r_u->ptr_0))
+	if(!prs_uint32("ptr_0 ", ps, depth, &r_u->ptr_0))
 		return False;
 
-	if (ps->io) {
-		/* reading.  do the length later */
-		if(!prs_uint32("sid_stuff_len0", ps, depth, &r_u->sid_stuff_len0))
+	if (r_u->ptr_0 != 0 && r_u->ctr != NULL) {
+		if(!prs_uint16("switch_value", ps, depth, &r_u->switch_value))
 			return False;
-	} else {
-		/* storing */
-		ptr_len0 = prs_offset(ps);
-		if(!prs_set_offset(ps, ptr_len0 + 4))
+		if(!prs_align(ps))
 			return False;
-	}
 
-	if (r_u->ptr_0 != 0) {
-		if(!prs_uint32("ptr_1         ", ps, depth, &r_u->ptr_1))
-			return False;
-		if (ps->io) {
-			/* reading.  do the length later */
-			if(!prs_uint32("sid_stuff_len1", ps, depth, &r_u->sid_stuff_len1))
+		switch (r_u->switch_value) {
+		case 0x0c:
+			if(!sam_io_unk_info12("unk_inf12", &r_u->ctr->info.inf12, ps, depth))
+				return False;
+			break;
+		case 0x07:
+			if(!sam_io_unk_info7("unk_inf7",&r_u->ctr->info.inf7, ps,depth))
 				return False;
-		} else {
-			/* storing */
-			ptr_len1 = prs_offset(ps);
-			if(!prs_set_offset(ps, ptr_len1 + 4))
+			break;
+		case 0x06:
+			if(!sam_io_unk_info6("unk_inf6",&r_u->ctr->info.inf6, ps,depth))
 				return False;
-		}
-
-		if (r_u->ptr_1 != 0) {
-			ptr_sid_stuff = prs_offset(ps);
-			if(!sam_io_sid_stuff("", &r_u->sid_stuff, ps, depth))
+			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_dom_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 (!(ps->io)) {
-		/* storing not reading.  do the length, now. */
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+	
+	return True;
+}
 
-		if (ptr_sid_stuff != 0) {
-			int old_len = prs_offset(ps);
-			uint32 sid_stuff_len = old_len - ptr_sid_stuff;
+/*******************************************************************
+reads or writes a SAMR_R_QUERY_SEC_OBJ structure.
+********************************************************************/
 
-			if(!prs_set_offset(ps, ptr_len0))
-				return False;
-			if(!prs_uint32("sid_stuff_len0", ps, depth, &sid_stuff_len))
-				return False;
+BOOL samr_io_r_query_sec_obj(char *desc, SAMR_R_QUERY_SEC_OBJ * r_u,
+			     prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
+		return False;
+  
+	prs_debug(ps, depth, desc, "samr_io_r_query_sec_obj");
+	depth++;
 
-			if(!prs_set_offset(ps, ptr_len1))
-				return False;
-			if(!prs_uint32("sid_stuff_len1", ps, depth, &sid_stuff_len))
-				return False;
+	if(!prs_align(ps))
+		return False;
 
-			if(!prs_set_offset(ps, old_len))
-				return False;
-		}
+	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
+		return False;
+	if (r_u->ptr != 0) {
+		if(!sec_io_desc_buf("sec", &r_u->buf, ps, depth))
+			return False;
 	}
 
 	if(!prs_uint32("status", ps, depth, &r_u->status))
@@ -928,11 +842,12 @@ BOOL samr_io_r_unknown_3(char *desc,  SAMR_R_UNKNOWN_3 *r_u, prs_struct *ps, int
 }
 
 /*******************************************************************
- Reads or writes a SAM_STR1 structure.
+reads or writes a SAM_STR1 structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_str1(char *desc, SAM_STR1 *sam, uint32 acct_buf,
-				uint32 name_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static BOOL sam_io_sam_str1(char *desc, SAM_STR1 * sam, uint32 acct_buf,
+			    uint32 name_buf, uint32 desc_buf,
+			    prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -942,31 +857,35 @@ static BOOL sam_io_sam_str1(char *desc, SAM_STR1 *sam, uint32 acct_buf,
 
 	if(!prs_align(ps))
 		return False;
-
-	if(!smb_io_unistr2("unistr2", &sam->uni_acct_name, acct_buf, ps, depth)) /* account name unicode string */
+	if (!smb_io_unistr2("name", &sam->uni_acct_name, acct_buf, ps, depth))
 		return False;
-	if(!smb_io_unistr2("unistr2", &sam->uni_full_name, name_buf, ps, depth)) /* full name unicode string */
+
+	if (!smb_io_unistr2("desc", &sam->uni_acct_desc, desc_buf, ps, depth))
 		return False;
-	if(!smb_io_unistr2("unistr2", &sam->uni_acct_desc, desc_buf, ps, depth)) /* account description unicode string */
+
+	if (!smb_io_unistr2("full", &sam->uni_full_name, name_buf, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAM_ENTRY1 structure.
+inits a SAM_ENTRY1 structure.
 ********************************************************************/
 
-static void init_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx, 
-				uint32 len_sam_name, uint32 len_sam_full, uint32 len_sam_desc,
-				uint32 rid_user, uint16 acb_info)
+static void init_sam_entry1(SAM_ENTRY1 * sam, uint32 user_idx,
+			    uint32 len_sam_name, uint32 len_sam_full,
+			    uint32 len_sam_desc, uint32 rid_user,
+			    uint16 acb_info)
 {
-	DEBUG(5,("init_sam_entry1\n"));
+	DEBUG(5, ("init_sam_entry1\n"));
+
+	ZERO_STRUCTP(sam);
 
 	sam->user_idx = user_idx;
 	sam->rid_user = rid_user;
 	sam->acb_info = acb_info;
-	sam->pad      = 0;
+	sam->pad = 0;
 
 	init_uni_hdr(&sam->hdr_acct_name, len_sam_name);
 	init_uni_hdr(&sam->hdr_user_name, len_sam_full);
@@ -974,10 +893,11 @@ static void init_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
 }
 
 /*******************************************************************
- Reads or writes a SAM_ENTRY1 structure.
+reads or writes a SAM_ENTRY1 structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry1(char *desc, SAM_ENTRY1 * sam,
+			      prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -998,21 +918,22 @@ static BOOL sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int
 	if(!prs_uint16("pad      ", ps, depth, &sam->pad))
 		return False;
 
-	if(!smb_io_unihdr("unihdr", &sam->hdr_acct_name, ps, depth)) /* account name unicode string header */
+	if (!smb_io_unihdr("hdr_acct_name", &sam->hdr_acct_name, ps, depth))
 		return False;
-	if(!smb_io_unihdr("unihdr", &sam->hdr_user_name, ps, depth)) /* account name unicode string header */
+	if (!smb_io_unihdr("hdr_user_desc", &sam->hdr_user_desc, ps, depth))
 		return False;
-	if(!smb_io_unihdr("unihdr", &sam->hdr_user_desc, ps, depth)) /* account name unicode string header */
+	if (!smb_io_unihdr("hdr_user_name", &sam->hdr_user_name, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a SAM_STR2 structure.
+reads or writes a SAM_STR2 structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static BOOL sam_io_sam_str2(char *desc, SAM_STR2 * sam, uint32 acct_buf,
+			    uint32 desc_buf, prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -1023,38 +944,38 @@ static BOOL sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_unistr2("unistr2", &sam->uni_srv_name, acct_buf, ps, depth)) /* account name unicode string */
+	if(!smb_io_unistr2("uni_srv_name", &sam->uni_srv_name, acct_buf, ps, depth)) /* account name unicode string */
 		return False;
-	if(!smb_io_unistr2("unistr2", &sam->uni_srv_desc, desc_buf, ps, depth)) /* account description unicode string */
+	if(!smb_io_unistr2("uni_srv_desc", &sam->uni_srv_desc, desc_buf, ps, depth))	/* account desc unicode string */
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAM_ENTRY2 structure.
+inits a SAM_ENTRY2 structure.
 ********************************************************************/
-
-static void init_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx, 
-				uint32 len_sam_name, uint32 len_sam_desc,
-				uint32 rid_user, uint16 acb_info)
+static void init_sam_entry2(SAM_ENTRY2 * sam, uint32 user_idx,
+			    uint32 len_sam_name, uint32 len_sam_desc,
+			    uint32 rid_user, uint16 acb_info)
 {
-	DEBUG(5,("init_sam_entry2\n"));
+	DEBUG(5, ("init_sam_entry2\n"));
 
 	sam->user_idx = user_idx;
 	sam->rid_user = rid_user;
 	sam->acb_info = acb_info;
-	sam->pad      = 0;
+	sam->pad = 0;
 
 	init_uni_hdr(&sam->hdr_srv_name, len_sam_name);
 	init_uni_hdr(&sam->hdr_srv_desc, len_sam_desc);
 }
 
 /*******************************************************************
- Reads or writes a SAM_ENTRY2 structure.
+reads or writes a SAM_ENTRY2 structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry2(char *desc, SAM_ENTRY2 * sam,
+			      prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -1075,19 +996,20 @@ static BOOL sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int
 	if(!prs_uint16("pad      ", ps, depth, &sam->pad))
 		return False;
 
-	if(!smb_io_unihdr("unihdr", &sam->hdr_srv_name, ps, depth)) /* account name unicode string header */
+	if(!smb_io_unihdr("unihdr", &sam->hdr_srv_name, ps, depth))	/* account name unicode string header */
 		return False;
-	if(!smb_io_unihdr("unihdr", &sam->hdr_srv_desc, ps, depth)) /* account name unicode string header */
+	if(!smb_io_unihdr("unihdr", &sam->hdr_srv_desc, ps, depth))	/* account name unicode string header */
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a SAM_STR3 structure.
+reads or writes a SAM_STR3 structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static BOOL sam_io_sam_str3(char *desc, SAM_STR3 * sam, uint32 acct_buf,
+			    uint32 desc_buf, prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -1098,37 +1020,38 @@ static BOOL sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_unistr2("unistr2", &sam->uni_grp_name, acct_buf, ps, depth)) /* account name unicode string */
+	if(!smb_io_unistr2("uni_grp_name", &sam->uni_grp_name, acct_buf, ps, depth))	/* account name unicode string */
 		return False;
-	if(!smb_io_unistr2("unistr2", &sam->uni_grp_desc, desc_buf, ps, depth)) /* account description unicode string */
+	if(!smb_io_unistr2("uni_grp_desc", &sam->uni_grp_desc, desc_buf, ps, depth))	/* account desc unicode string */
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAM_ENTRY3 structure.
+inits a SAM_ENTRY3 structure.
 ********************************************************************/
 
-static void init_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx, 
-				uint32 len_grp_name, uint32 len_grp_desc, uint32 rid_grp)
+static void init_sam_entry3(SAM_ENTRY3 * sam, uint32 grp_idx,
+			    uint32 len_grp_name, uint32 len_grp_desc,
+			    uint32 rid_grp)
 {
-	DEBUG(5,("init_sam_entry3\n"));
+	DEBUG(5, ("init_sam_entry3\n"));
 
-	ZERO_STRUCTP(sam);
 	sam->grp_idx = grp_idx;
 	sam->rid_grp = rid_grp;
-	sam->attr    = 0x07; /* group rid attributes - gets ignored by nt 4.0 */
+	sam->attr = 0x07;	/* group rid attributes - gets ignored by nt 4.0 */
 
 	init_uni_hdr(&sam->hdr_grp_name, len_grp_name);
 	init_uni_hdr(&sam->hdr_grp_desc, len_grp_desc);
 }
 
 /*******************************************************************
- Reads or writes a SAM_ENTRY3 structure.
+reads or writes a SAM_ENTRY3 structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry3(char *desc, SAM_ENTRY3 * sam,
+			      prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -1147,31 +1070,108 @@ static BOOL sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int
 	if(!prs_uint32("attr   ", ps, depth, &sam->attr))
 		return False;
 
-	if(!smb_io_unihdr("unihdr", &sam->hdr_grp_name, ps, depth)) /* account name unicode string header */
+	if(!smb_io_unihdr("unihdr", &sam->hdr_grp_name, ps, depth))	/* account name unicode string header */
+		return False;
+	if(!smb_io_unihdr("unihdr", &sam->hdr_grp_desc, ps, depth))	/* account name unicode string header */
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAM_ENTRY4 structure.
+********************************************************************/
+
+static void init_sam_entry4(SAM_ENTRY4 * sam, uint32 user_idx,
+			    uint32 len_acct_name)
+{
+	DEBUG(5, ("init_sam_entry4\n"));
+
+	sam->user_idx = user_idx;
+	init_str_hdr(&sam->hdr_acct_name, len_acct_name, len_acct_name,
+		     len_acct_name != 0);
+}
+
+/*******************************************************************
+reads or writes a SAM_ENTRY4 structure.
+********************************************************************/
+
+static BOOL sam_io_sam_entry4(char *desc, SAM_ENTRY4 * sam,
+			      prs_struct *ps, int depth)
+{
+	if (sam == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "sam_io_sam_entry4");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("user_idx", ps, depth, &sam->user_idx))
+		return False;
+	if(!smb_io_strhdr("strhdr", &sam->hdr_acct_name, ps, depth))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAM_ENTRY5 structure.
+********************************************************************/
+
+static void init_sam_entry5(SAM_ENTRY5 * sam, uint32 grp_idx,
+			    uint32 len_grp_name)
+{
+	DEBUG(5, ("init_sam_entry5\n"));
+
+	sam->grp_idx = grp_idx;
+	init_str_hdr(&sam->hdr_grp_name, len_grp_name, len_grp_name,
+		     len_grp_name != 0);
+}
+
+/*******************************************************************
+reads or writes a SAM_ENTRY5 structure.
+********************************************************************/
+
+static BOOL sam_io_sam_entry5(char *desc, SAM_ENTRY5 * sam,
+			      prs_struct *ps, int depth)
+{
+	if (sam == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "sam_io_sam_entry5");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("grp_idx", ps, depth, &sam->grp_idx))
 		return False;
-	if(!smb_io_unihdr("unihdr", &sam->hdr_grp_desc, ps, depth)) /* account name unicode string header */
+	if(!smb_io_strhdr("strhdr", &sam->hdr_grp_name, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAM_ENTRY structure.
+inits a SAM_ENTRY structure.
 ********************************************************************/
 
-static void init_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
+void init_sam_entry(SAM_ENTRY * sam, uint32 len_sam_name, uint32 rid)
 {
-	DEBUG(5,("init_sam_entry\n"));
+	DEBUG(10, ("init_sam_entry: %d %d\n", len_sam_name, rid));
 
 	sam->rid = rid;
 	init_uni_hdr(&sam->hdr_name, len_sam_name);
 }
 
 /*******************************************************************
- Reads or writes a SAM_ENTRY structure.
+reads or writes a SAM_ENTRY structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry(char *desc, SAM_ENTRY * sam,
+			     prs_struct *ps, int depth)
 {
 	if (sam == NULL)
 		return False;
@@ -1183,37 +1183,36 @@ static BOOL sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int de
 		return False;
 	if(!prs_uint32("rid", ps, depth, &sam->rid))
 		return False;
-	if(!smb_io_unihdr("unihdr", &sam->hdr_name, ps, depth)) /* account name unicode string header */
+	if(!smb_io_unihdr("unihdr", &sam->hdr_name, ps, depth))	/* account name unicode string header */
 		return False;
 
 	return True;
 }
 
-
 /*******************************************************************
- Inits a SAMR_Q_ENUM_DOM_USERS structure.
+inits a SAMR_Q_ENUM_DOM_USERS structure.
 ********************************************************************/
 
-void init_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_e, POLICY_HND *pol,
-				uint16 req_num_entries, uint16 unk_0,
+void init_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS * q_e, POLICY_HND *pol,
+				uint32 start_idx,
 				uint16 acb_mask, uint16 unk_1, uint32 size)
 {
-	DEBUG(5,("init_q_enum_dom_users\n"));
+	DEBUG(5, ("init_samr_q_enum_dom_users\n"));
 
-	memcpy(&q_e->pol, pol, sizeof(*pol));
+	q_e->pol = *pol;
 
-	q_e->req_num_entries = req_num_entries; /* zero indicates lots */
-	q_e->unknown_0 = unk_0; /* this gets returned in the response */
-	q_e->acb_mask  = acb_mask;
+	q_e->start_idx = start_idx;	/* zero indicates lots */
+	q_e->acb_mask = acb_mask;
 	q_e->unknown_1 = unk_1;
 	q_e->max_size = size;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_enum_dom_users(char *desc, SAMR_Q_ENUM_DOM_USERS * q_e,
+			      prs_struct *ps, int depth)
 {
 	if (q_e == NULL)
 		return False;
@@ -1224,25 +1223,17 @@ BOOL samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint16("req_num_entries", ps, depth, &q_e->req_num_entries))
-		return False;
-	if(!prs_uint16("unknown_0      ", ps, depth, &q_e->unknown_0))
+	if(!smb_io_pol_hnd("domain_pol", &q_e->pol, ps, depth))
 		return False;
 
-	if(!prs_uint16("acb_mask       ", ps, depth, &q_e->acb_mask))
+	if(!prs_uint32("start_idx", ps, depth, &q_e->start_idx))
 		return False;
-	if(!prs_uint16("unknown_1      ", ps, depth, &q_e->unknown_1))
+	if(!prs_uint16("acb_mask ", ps, depth, &q_e->acb_mask))
 		return False;
-
-	if(!prs_uint32("max_size       ", ps, depth, &q_e->max_size))
+	if(!prs_uint16("unknown_1", ps, depth, &q_e->unknown_1))
 		return False;
 
-	if(!prs_align(ps))
+	if(!prs_uint32("max_size ", ps, depth, &q_e->max_size))
 		return False;
 
 	return True;
@@ -1250,60 +1241,38 @@ BOOL samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc
 
 
 /*******************************************************************
- Inits a SAMR_R_ENUM_DOM_USERS structure.
+inits a SAMR_R_ENUM_DOM_USERS structure.
 ********************************************************************/
 
-void init_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
-		uint16 total_num_entries, uint16 unk_0,
-		uint32 num_sam_entries, SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES], uint32 status)
+void init_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS * r_u,
+				uint32 next_idx, uint32 num_sam_entries)
 {
-	int i;
-
-	DEBUG(5,("init_samr_r_enum_dom_users\n"));
+	DEBUG(5, ("init_samr_r_enum_dom_users\n"));
 
-	if (num_sam_entries >= MAX_SAM_ENTRIES) {
-		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d\n",
-			 num_sam_entries));
-	}
+	r_u->next_idx = next_idx;
 
-	r_u->total_num_entries = total_num_entries;
-	r_u->unknown_0         = unk_0;
-
-	if (total_num_entries > 0) {
+	if (num_sam_entries != 0) {
 		r_u->ptr_entries1 = 1;
 		r_u->ptr_entries2 = 1;
 		r_u->num_entries2 = num_sam_entries;
 		r_u->num_entries3 = num_sam_entries;
 
-		SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries);
-		SMB_ASSERT_ARRAY(r_u->uni_acct_name, num_sam_entries);
-
-		for (i = 0; i < num_sam_entries; i++) {
-			init_sam_entry(&(r_u->sam[i]),
-			               pass[i].uni_user_name.uni_str_len,
-			               pass[i].user_rid);
-
-			copy_unistr2(&r_u->uni_acct_name[i], &(pass[i].uni_user_name));
-		}
-
 		r_u->num_entries4 = num_sam_entries;
 	} else {
 		r_u->ptr_entries1 = 0;
 		r_u->num_entries2 = num_sam_entries;
 		r_u->ptr_entries2 = 1;
 	}
-
-	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS * r_u,
+			      prs_struct *ps, int depth)
 {
-	int i;
+	uint32 i;
 
 	if (r_u == NULL)
 		return False;
@@ -1314,14 +1283,12 @@ BOOL samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint16("total_num_entries", ps, depth, &r_u->total_num_entries))
-		return False;
-	if(!prs_uint16("unknown_0        ", ps, depth, &r_u->unknown_0))
+	if(!prs_uint32("next_idx    ", ps, depth, &r_u->next_idx))
 		return False;
 	if(!prs_uint32("ptr_entries1", ps, depth, &r_u->ptr_entries1))
 		return False;
 
-	if (r_u->total_num_entries != 0 && r_u->ptr_entries1 != 0) {
+	if (r_u->ptr_entries1 != 0) {
 		if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
 			return False;
 		if(!prs_uint32("ptr_entries2", ps, depth, &r_u->ptr_entries2))
@@ -1329,28 +1296,35 @@ BOOL samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 		if(!prs_uint32("num_entries3", ps, depth, &r_u->num_entries3))
 			return False;
 
-		SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries2);
+		if (UNMARSHALLING(ps) && (r_u->num_entries2 != 0)) {
+			r_u->sam = (SAM_ENTRY *)prs_alloc_mem(ps,sizeof(SAM_ENTRY)*r_u->num_entries2);
+			r_u->uni_acct_name = (UNISTR2 *)prs_alloc_mem(ps,sizeof(UNISTR2)*r_u->num_entries2);
+		}
+
+		if ((r_u->sam == NULL || r_u->uni_acct_name == NULL) && r_u->num_entries2 != 0) {
+			DEBUG(0,("NULL pointers in SAMR_R_ENUM_DOM_USERS\n"));
+			r_u->num_entries4 = 0;
+			r_u->status = NT_STATUS_MEMORY_NOT_ALLOCATED;
+			return False;
+		}
 
 		for (i = 0; i < r_u->num_entries2; i++) {
 			if(!sam_io_sam_entry("", &r_u->sam[i], ps, depth))
 				return False;
 		}
 
-		SMB_ASSERT_ARRAY(r_u->uni_acct_name, r_u->num_entries2);
-
 		for (i = 0; i < r_u->num_entries2; i++) {
-			if(!smb_io_unistr2("", &r_u->uni_acct_name[i],
-					r_u->sam[i].hdr_name.buffer, ps, depth))
+			if(!smb_io_unistr2("", &r_u->uni_acct_name[i],r_u->sam[i].hdr_name.buffer, ps,depth))
 				return False;
 		}
 
-		if(!prs_align(ps))
-			return False;
-
-		if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
-			return False;
 	}
 
+	if(!prs_align(ps))
+		return False;
+		
+	if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
+		return False;
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -1358,289 +1332,359 @@ BOOL samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 }
 
 /*******************************************************************
- Inits a SAMR_Q_ENUM_DOM_ALIASES structure.
+inits a SAMR_Q_QUERY_DISPINFO structure.
 ********************************************************************/
 
-void init_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_e, POLICY_HND *pol, uint32 size)
+void init_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO * q_e, POLICY_HND *pol,
+				uint16 switch_level, uint32 start_idx,
+				uint32 max_entries)
 {
-	DEBUG(5,("init_q_enum_dom_aliases\n"));
+	DEBUG(5, ("init_samr_q_query_dispinfo\n"));
 
-	memcpy(&q_e->pol, pol, sizeof(*pol));
+	q_e->domain_pol = *pol;
 
-	q_e->unknown_0 = 0;
-	q_e->max_size = size;
-}
+	q_e->switch_level = switch_level;
 
+	q_e->start_idx = start_idx;
+	q_e->max_entries = max_entries;
+	q_e->max_size = 0xffff;	/* Not especially useful */
+}
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_enum_dom_aliases(char *desc,  SAMR_Q_ENUM_DOM_ALIASES *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_query_dispinfo(char *desc, SAMR_Q_QUERY_DISPINFO * q_e,
+			      prs_struct *ps, int depth)
 {
 	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_aliases");
+	prs_debug(ps, depth, desc, "samr_io_q_query_dispinfo");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
+	if(!smb_io_pol_hnd("domain_pol", &q_e->domain_pol, ps, depth))
+		return False;
+
+	if(!prs_uint16("switch_level", ps, depth, &q_e->switch_level))
 		return False;
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("unknown_0", ps, depth, &q_e->unknown_0))
+	if(!prs_uint32("start_idx   ", ps, depth, &q_e->start_idx))
 		return False;
-	if(!prs_uint32("max_size ", ps, depth, &q_e->max_size ))
+	if(!prs_uint32("max_entries ", ps, depth, &q_e->max_entries))
 		return False;
-
-	if(!prs_align(ps))
+	if(!prs_uint32("max_size    ", ps, depth, &q_e->max_size))
 		return False;
 
 	return True;
 }
 
-
 /*******************************************************************
- Inits a SAMR_R_ENUM_DOM_ALIASES structure.
+inits a SAM_DISPINFO_1 structure.
 ********************************************************************/
 
-void init_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u,
-		uint32 num_sam_entries, SAM_USER_INFO_21 grps[MAX_SAM_ENTRIES],
-		uint32 status)
+void init_sam_dispinfo_1(SAM_DISPINFO_1 * sam, uint32 *num_entries,
+			 uint32 *data_size, uint32 start_idx,
+			 SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
-	int i;
+	uint32 len_sam_name, len_sam_full, len_sam_desc;
+	uint32 max_entries, max_data_size;
+	uint32 dsize = 0;
+	uint32 i;
 
-	DEBUG(5,("init_samr_r_enum_dom_aliases\n"));
+	ZERO_STRUCTP(sam);
 
-	if (num_sam_entries >= MAX_SAM_ENTRIES) {
-		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d\n", 
-			 num_sam_entries));
-	}
+	max_entries = *num_entries;
+	max_data_size = *data_size;
 
-	r_u->num_entries  = num_sam_entries;
+	DEBUG(5, ("init_sam_dispinfo_1: max_entries: %d max_dsize: 0x%x\n",
+		  max_entries, max_data_size));
 
-	if (num_sam_entries > 0) {
-		r_u->ptr_entries  = 1;
-		r_u->num_entries2 = num_sam_entries;
-		r_u->ptr_entries2 = 1;
-		r_u->num_entries3 = num_sam_entries;
-
-		SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries);
+	for (i = 0; (i < max_entries) && (dsize < max_data_size); i++) {
+		len_sam_name = pass[i].uni_user_name.uni_str_len;
+		len_sam_full = pass[i].uni_full_name.uni_str_len;
+		len_sam_desc = pass[i].uni_acct_desc.uni_str_len;
 
-		for (i = 0; i < num_sam_entries; i++) {
-			init_sam_entry(&r_u->sam[i],
-			               grps[i].uni_user_name.uni_str_len,
-			               grps[i].user_rid);
+		init_sam_entry1(&sam->sam[i], start_idx + i + 1,
+				len_sam_name, len_sam_full, len_sam_desc,
+				pass[i].user_rid, pass[i].acb_info);
 
-			copy_unistr2(&r_u->uni_grp_name[i], &(grps[i].uni_user_name));
-		}
+		copy_unistr2(&sam->str[i].uni_acct_name, &pass[i].uni_user_name);
+		copy_unistr2(&sam->str[i].uni_full_name, &pass[i].uni_full_name);
+		copy_unistr2(&sam->str[i].uni_acct_desc, &pass[i].uni_acct_desc);
 
-		r_u->num_entries4 = num_sam_entries;
-	} else {
-		r_u->ptr_entries = 0;
+		dsize += sizeof(SAM_ENTRY1);
+		dsize += len_sam_name + len_sam_full + len_sam_desc;
 	}
 
-	r_u->status = status;
+	*num_entries = i;
+	*data_size = dsize;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 * sam,
+				  uint32 num_entries,
+				  prs_struct *ps, int depth)
 {
-	int i;
+	uint32 i;
 
-	if (r_u == NULL)
+	if (sam == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases");
+	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_1");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_entries", ps, depth, &r_u->num_entries))
-		return False;
-	if(!prs_uint32("ptr_entries", ps, depth, &r_u->ptr_entries))
-		return False;
+	SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-	if (r_u->num_entries != 0 && r_u->ptr_entries != 0) {
-		if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
-			return False;
-		if(!prs_uint32("ptr_entries2", ps, depth, &r_u->ptr_entries2))
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_entry1("", &sam->sam[i], ps, depth))
 			return False;
-		if(!prs_uint32("num_entries3", ps, depth, &r_u->num_entries3))
+	}
+
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_str1("", &sam->str[i],
+			      sam->sam[i].hdr_acct_name.buffer,
+			      sam->sam[i].hdr_user_name.buffer,
+			      sam->sam[i].hdr_user_desc.buffer, ps, depth))
 			return False;
+	}
 
-		SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+	return True;
+}
 
-		for (i = 0; i < r_u->num_entries; i++) {
-			if(!sam_io_sam_entry("", &r_u->sam[i], ps, depth))
-				return False;
-		}
+/*******************************************************************
+inits a SAM_DISPINFO_2 structure.
+********************************************************************/
 
-		for (i = 0; i < r_u->num_entries; i++) {
-			if(!smb_io_unistr2("", &r_u->uni_grp_name[i], r_u->sam[i].hdr_name.buffer, ps, depth))
-				return False;
-		}
+void init_sam_dispinfo_2(SAM_DISPINFO_2 * sam, uint32 *num_entries,
+			 uint32 *data_size, uint32 start_idx,
+			 SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
+{
+	uint32 len_sam_name, len_sam_desc;
+	uint32 max_entries, max_data_size;
+	uint32 dsize = 0;
+	uint32 i;
 
-		if(!prs_align(ps))
-			return False;
+	DEBUG(5, ("init_sam_dispinfo_2\n"));
 
-		if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
-			return False;
+	ZERO_STRUCTP(sam);
+
+	max_entries = *num_entries;
+	max_data_size = *data_size;
+
+	for (i = 0; (i < max_entries) && (dsize < max_data_size); i++) {
+		len_sam_name = pass[i].uni_user_name.uni_str_len;
+		len_sam_desc = pass[i].uni_acct_desc.uni_str_len;
+	  
+		init_sam_entry2(&sam->sam[i], start_idx + i + 1,
+			  len_sam_name, len_sam_desc,
+			  pass[i].user_rid, pass[i].acb_info);
+	  
+		copy_unistr2(&sam->str[i].uni_srv_name,
+		       &pass[i].uni_user_name);
+		copy_unistr2(&sam->str[i].uni_srv_desc,
+		       &pass[i].uni_acct_desc);
+	  
+		dsize += sizeof(SAM_ENTRY2);
+		dsize += len_sam_name + len_sam_desc;
 	}
 
-	if(!prs_uint32("status", ps, depth, &r_u->status))
+	*num_entries = i;
+	*data_size = dsize;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+static BOOL sam_io_sam_dispinfo_2(char *desc, SAM_DISPINFO_2 * sam,
+				  uint32 num_entries,
+				  prs_struct *ps, int depth)
+{
+	uint32 i;
+
+	if (sam == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_2");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
 
+	SMB_ASSERT_ARRAY(sam->sam, num_entries);
+
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_entry2("", &sam->sam[i], ps, depth))
+			return False;
+	}
+
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_str2("", &sam->str[i],
+			      sam->sam[i].hdr_srv_name.buffer,
+			      sam->sam[i].hdr_srv_desc.buffer, ps, depth))
+			return False;
+	}
+
 	return True;
 }
 
-
 /*******************************************************************
- Inits a SAMR_Q_QUERY_DISPINFO structure.
+inits a SAM_DISPINFO_3 structure.
 ********************************************************************/
 
-void init_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
-				uint16 switch_level, uint32 start_idx, uint32 size)
+void init_sam_dispinfo_3(SAM_DISPINFO_3 * sam, uint32 *num_entries,
+			 uint32 *data_size, uint32 start_idx,
+			 DOMAIN_GRP * grp)
 {
-	DEBUG(5,("init_q_query_dispinfo\n"));
+	uint32 len_sam_name, len_sam_desc;
+	uint32 max_entries, max_data_size;
+	uint32 dsize = 0;
+	uint32 i;
 
-	memcpy(&q_e->pol, pol, sizeof(*pol));
+	DEBUG(5, ("init_sam_dispinfo_3\n"));
 
-	q_e->switch_level = switch_level;
+	ZERO_STRUCTP(sam);
 
-	q_e->start_idx = start_idx;
-	q_e->max_entries = 0;
-	q_e->max_size  = size;
+	max_entries = *num_entries;
+	max_data_size = *data_size;
+
+	for (i = 0; (i < max_entries) && (dsize < max_data_size); i++) {
+		len_sam_name = strlen(grp[i].name);
+		len_sam_desc = strlen(grp[i].comment);
+
+		init_sam_entry3(&sam->sam[i], start_idx + i + 1, len_sam_name, len_sam_desc, grp[i].rid);
+	  
+		init_unistr2(&sam->str[i].uni_grp_name, grp[i].name, len_sam_name);
+		init_unistr2(&sam->str[i].uni_grp_desc, grp[i].comment, len_sam_desc);
+	  
+		dsize += sizeof(SAM_ENTRY3);
+		dsize += (len_sam_name + len_sam_desc) * 2;
+		dsize += 14;
+	}
+
+	*num_entries = i;
+	*data_size = dsize;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_3(char *desc, SAM_DISPINFO_3 * sam,
+				  uint32 num_entries,
+				  prs_struct *ps, int depth)
 {
-	if (q_e == NULL)
+	uint32 i;
+
+	if (sam == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_query_dispinfo");
+	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_3");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
-		return False;
+	SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-	if(!prs_uint16("switch_level", ps, depth, &q_e->switch_level))
-		return False;
-#if 0
-	if(!prs_uint16("unknown_0   ", ps, depth, &q_e->unknown_0))
-		return False;
-#else
-	prs_align(ps);
-#endif
-	if(!prs_uint32("start_idx   ", ps, depth, &q_e->start_idx))
-		return False;
-	if(!prs_uint32("max_entries ", ps, depth, &q_e->max_entries))
-		return False;
-	if(!prs_uint32("max_size    ", ps, depth, &q_e->max_size))
-		return False;
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_entry3("", &sam->sam[i], ps, depth))
+			return False;
+	}
 
-	if(!prs_align(ps))
-		return False;
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_str3("", &sam->str[i],
+			      sam->sam[i].hdr_grp_name.buffer,
+			      sam->sam[i].hdr_grp_desc.buffer, ps, depth))
+			return False;
+	}
 
 	return True;
 }
 
-
 /*******************************************************************
- Inits a SAM_INFO_2 structure.
+inits a SAM_DISPINFO_4 structure.
 ********************************************************************/
 
-void init_sam_info_2(SAM_INFO_2 *sam, uint32 acb_mask,
-		uint32 start_idx, uint32 num_sam_entries,
-		SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
+void init_sam_dispinfo_4(SAM_DISPINFO_4 * sam, uint32 *num_entries,
+			 uint32 *data_size, uint32 start_idx,
+			 SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
-	int i;
-	int entries_added;
-
-	DEBUG(5,("init_sam_info_2\n"));
-
-	if (num_sam_entries >= MAX_SAM_ENTRIES) {
-		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d\n", 
-			 num_sam_entries));
-	}
+	fstring sam_name;
+	uint32 len_sam_name;
+	uint32 max_entries, max_data_size;
+	uint32 dsize = 0;
+	uint32 i;
 
-	for (i = start_idx, entries_added = 0; i < num_sam_entries; i++) {
-		if ((pass[i].acb_info & acb_mask) == acb_mask) {
-			init_sam_entry2(&sam->sam[entries_added],
-			                start_idx + entries_added + 1,
-			                pass[i].uni_user_name.uni_str_len,
-			                pass[i].uni_acct_desc.uni_str_len,
-			                pass[i].user_rid,
-			                pass[i].acb_info);
+	DEBUG(5, ("init_sam_dispinfo_4\n"));
 
-			copy_unistr2(&sam->str[entries_added].uni_srv_name, &pass[i].uni_user_name);
-			copy_unistr2(&sam->str[entries_added].uni_srv_desc, &pass[i].uni_acct_desc);
+	ZERO_STRUCTP(sam);
 
-			entries_added++;
-		}
+	max_entries = *num_entries;
+	max_data_size = *data_size;
 
-		sam->num_entries   = entries_added;
-		sam->ptr_entries   = 1;
-		sam->num_entries2  = entries_added;
+	for (i = 0; (i < max_entries) && (dsize < max_data_size); i++) {
+		len_sam_name = pass[i].uni_user_name.uni_str_len;
+	  
+		init_sam_entry4(&sam->sam[i], start_idx + i + 1,
+			  len_sam_name);
+	  
+		unistr2_to_ascii(sam_name, &pass[i].uni_user_name,
+			   sizeof(sam_name));
+		init_string2(&sam->str[i].acct_name, sam_name,
+		       len_sam_name);
+	  
+		dsize += sizeof(SAM_ENTRY4);
+		dsize += len_sam_name;
 	}
+	
+	*num_entries = i;
+	*data_size = dsize;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_info_2(char *desc,  SAM_INFO_2 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_4(char *desc, SAM_DISPINFO_4 * sam,
+				  uint32 num_entries,
+				  prs_struct *ps, int depth)
 {
-	int i;
+	uint32 i;
 
 	if (sam == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_sam_info_2");
+	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_4");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_entries  ", ps, depth, &sam->num_entries))
-		return False;
-	if(!prs_uint32("ptr_entries  ", ps, depth, &sam->ptr_entries))
-		return False;
-
-	if(!prs_uint32("num_entries2 ", ps, depth, &sam->num_entries2))
-		return False;
-
-	SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+	SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-	for (i = 0; i < sam->num_entries; i++) {
-		if(!sam_io_sam_entry2("", &sam->sam[i], ps, depth))
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_entry4("", &sam->sam[i], ps, depth))
 			return False;
 	}
 
-	for (i = 0; i < sam->num_entries; i++) {
-		if(!sam_io_sam_str2 ("", &sam->str[i],
-				 sam->sam[i].hdr_srv_name.buffer,
-				 sam->sam[i].hdr_srv_desc.buffer,
-				 ps, depth))
+	for (i = 0; i < num_entries; i++) {
+		if(!smb_io_string2("acct_name", &sam->str[i].acct_name,
+			     sam->sam[i].hdr_acct_name.buffer, ps, depth))
+			return False;
+		if(!prs_align(ps))
 			return False;
 	}
 
@@ -1648,121 +1692,113 @@ static BOOL sam_io_sam_info_2(char *desc,  SAM_INFO_2 *sam, prs_struct *ps, int
 }
 
 /*******************************************************************
- Inits a SAM_INFO_1 structure.
+inits a SAM_DISPINFO_5 structure.
 ********************************************************************/
 
-void init_sam_info_1(SAM_INFO_1 *sam, uint32 acb_mask,
-		uint32 start_idx, uint32 num_sam_entries,
-		SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
+void init_sam_dispinfo_5(SAM_DISPINFO_5 * sam, uint32 *num_entries,
+			 uint32 *data_size, uint32 start_idx,
+			 DOMAIN_GRP * grp)
 {
-	int i;
-	int entries_added;
+	uint32 len_sam_name;
+	uint32 max_entries, max_data_size;
+	uint32 dsize = 0;
+	uint32 i;
 
-	DEBUG(5,("init_sam_info_1\n"));
+	DEBUG(5, ("init_sam_dispinfo_5\n"));
 
-	if (num_sam_entries >= MAX_SAM_ENTRIES) {
-		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d\n", 
-			 num_sam_entries));
-	}
-	DEBUG(5,("num_sam_entries: %u, start_idx: %u\n",num_sam_entries,
-		 num_sam_entries));
-
-	for (i = 0, entries_added = 0; 
-	     i < num_sam_entries; i++) {
-		if ((pass[i].acb_info & acb_mask) == acb_mask) {
-			init_sam_entry1(&sam->sam[entries_added],
-						start_idx + entries_added + 1,
-						pass[i].uni_user_name.uni_str_len,
-						pass[i].uni_full_name.uni_str_len, 
-						pass[i].uni_acct_desc.uni_str_len,
-						pass[i].user_rid,
-						pass[i].acb_info);
-
-			copy_unistr2(&sam->str[entries_added].uni_acct_name, &pass[i].uni_user_name);
-			copy_unistr2(&sam->str[entries_added].uni_full_name, &pass[i].uni_full_name);
-			copy_unistr2(&sam->str[entries_added].uni_acct_desc, &pass[i].uni_acct_desc);
-
-			entries_added++;
-		} 
-	}
+	ZERO_STRUCTP(sam);
 
-	sam->num_entries   = entries_added;
-	sam->ptr_entries   = 1;
-	sam->num_entries2  = entries_added;
+	max_entries = *num_entries;
+	max_data_size = *data_size;
+
+	for (i = 0; (i < max_entries) && (dsize < max_data_size); i++) {
+		len_sam_name = strlen(grp[i].name);
+	  
+		init_sam_entry5(&sam->sam[i], start_idx + i + 1,
+				len_sam_name);
+	  
+		init_string2(&sam->str[i].grp_name, grp[i].name,
+				len_sam_name);
+	  
+		dsize += sizeof(SAM_ENTRY5);
+		dsize += len_sam_name;
+	}
+	
+	*num_entries = i;
+	*data_size = dsize;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-static BOOL sam_io_sam_info_1(char *desc,  SAM_INFO_1 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_5(char *desc, SAM_DISPINFO_5 * sam,
+				  uint32 num_entries,
+				  prs_struct *ps, int depth)
 {
-	int i;
+	uint32 i;
 
 	if (sam == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_sam_info_1");
+	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_5");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_entries  ", ps, depth, &sam->num_entries))
-		return False;
-	if(!prs_uint32("ptr_entries  ", ps, depth, &sam->ptr_entries))
-		return False;
-
-	if(!prs_uint32("num_entries2 ", ps, depth, &sam->num_entries2))
-		return False;
-
-	SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+	SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-	for (i = 0; i < sam->num_entries; i++) {
-		if(!sam_io_sam_entry1("", &sam->sam[i], ps, depth))
+	for (i = 0; i < num_entries; i++) {
+		if(!sam_io_sam_entry5("", &sam->sam[i], ps, depth))
 			return False;
 	}
 
-	for (i = 0; i < sam->num_entries; i++) {
-		if(!sam_io_sam_str1 ("", &sam->str[i],
-							 sam->sam[i].hdr_acct_name.buffer,
-							 sam->sam[i].hdr_user_name.buffer,
-							 sam->sam[i].hdr_user_desc.buffer,
-							 ps, depth))
-		return False;
+	for (i = 0; i < num_entries; i++) {
+		if(!smb_io_string2("grp_name", &sam->str[i].grp_name,
+			     sam->sam[i].hdr_grp_name.buffer, ps, depth))
+			return False;
+		if(!prs_align(ps))
+			return False;
 	}
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_QUERY_DISPINFO structure.
+inits a SAMR_R_QUERY_DISPINFO structure.
 ********************************************************************/
 
-void init_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
-		uint16 switch_level, SAM_INFO_CTR *ctr, uint32 status)
+void init_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO * r_u,
+				uint32 num_entries, uint32 data_size,
+				uint16 switch_level, SAM_DISPINFO_CTR * ctr,
+				uint32 status)
 {
-	DEBUG(5,("init_samr_r_query_dispinfo\n"));
+	DEBUG(5, ("init_samr_r_query_dispinfo: level %d\n", switch_level));
 
-	if (status == 0x0 || status == 0x105) {
-		r_u->unknown_0 = 0x0000001;
-		r_u->unknown_1 = 0x0000001;
-	} else {
-		r_u->unknown_0 = 0x0;
-		r_u->unknown_1 = 0x0;
-	}
+	r_u->total_size = data_size;	/* not calculated */
+	r_u->data_size = data_size;
 
 	r_u->switch_level = switch_level;
+	r_u->num_entries = num_entries;
+
+	if (num_entries==0)
+		r_u->ptr_entries = 0;
+	else
+		r_u->ptr_entries = 1;
+
+	r_u->num_entries2 = num_entries;
 	r_u->ctr = ctr;
+
 	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_dispinfo(char *desc, SAMR_R_QUERY_DISPINFO * r_u,
+			      prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
@@ -1773,30 +1809,67 @@ BOOL samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, prs_struc
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("unknown_0    ", ps, depth, &r_u->unknown_0))
+	if(!prs_uint32("total_size  ", ps, depth, &r_u->total_size))
 		return False;
-	if(!prs_uint32("unknown_1    ", ps, depth, &r_u->unknown_1))
+	if(!prs_uint32("data_size   ", ps, depth, &r_u->data_size))
 		return False;
-	if(!prs_uint16("switch_level ", ps, depth, &r_u->switch_level))
+	if(!prs_uint16("switch_level", ps, depth, &r_u->switch_level))
 		return False;
-
 	if(!prs_align(ps))
 		return False;
 
+	if(!prs_uint32("num_entries ", ps, depth, &r_u->num_entries))
+		return False;
+	if(!prs_uint32("ptr_entries ", ps, depth, &r_u->ptr_entries))
+		return False;
+
+	if (r_u->ptr_entries==0) {
+		if(!prs_align(ps))
+			return False;
+		if(!prs_uint32("status", ps, depth, &r_u->status))
+			return False;
+
+		return True;
+	}
+
+	if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
+		return False;
+
 	switch (r_u->switch_level) {
 	case 0x1:
-		if(!sam_io_sam_info_1("users", r_u->ctr->sam.info1, ps, depth))
+		if(!sam_io_sam_dispinfo_1("users", r_u->ctr->sam.info1,
+				r_u->num_entries, ps, depth))
 			return False;
 		break;
 	case 0x2:
-		if(!sam_io_sam_info_2("servers", r_u->ctr->sam.info2, ps, depth))
+		if(!sam_io_sam_dispinfo_2("servers", r_u->ctr->sam.info2,
+				r_u->num_entries, ps, depth))
+			return False;
+		break;
+	case 0x3:
+		if(!sam_io_sam_dispinfo_3("groups", r_u->ctr->sam.info3,
+				    r_u->num_entries, ps, depth))
+			return False;
+		break;
+	case 0x4:
+		if(!sam_io_sam_dispinfo_4("user list",
+				    r_u->ctr->sam.info4,
+				    r_u->num_entries, ps, depth))
+			return False;
+		break;
+	case 0x5:
+		if(!sam_io_sam_dispinfo_5("group list",
+				    r_u->ctr->sam.info5,
+				    r_u->num_entries, ps, depth))
 			return False;
 		break;
 	default:
-		DEBUG(5,("samr_io_r_query_dispinfo: unknown switch value\n"));
+		DEBUG(0,("samr_io_r_query_dispinfo: unknown switch value\n"));
 		break;
 	}
-
+	
+	if(!prs_align(ps))
+		return False;
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -1804,196 +1877,241 @@ BOOL samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, prs_struc
 }
 
 /*******************************************************************
- Inits a SAMR_Q_ENUM_DOM_GROUPS structure.
+inits a SAMR_Q_OPEN_GROUP structure.
 ********************************************************************/
 
-void init_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e, POLICY_HND *pol,
-				uint16 switch_level, uint32 start_idx, uint32 size)
+void init_samr_q_open_group(SAMR_Q_OPEN_GROUP * q_c,
+			    POLICY_HND *hnd,
+			    uint32 access_mask, uint32 rid)
 {
-	DEBUG(5,("init_q_enum_dom_groups\n"));
-
-	memcpy(&q_e->pol, pol, sizeof(*pol));
+	DEBUG(5, ("init_samr_q_open_group\n"));
 
-	q_e->switch_level = switch_level;
-
-	q_e->unknown_0 = 0;
-	q_e->start_idx = start_idx;
-	q_e->unknown_1 = 0x000007d0;
-	q_e->max_size  = size;
+	q_c->domain_pol = *hnd;
+	q_c->access_mask = access_mask;
+	q_c->rid_group = rid;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_enum_dom_groups(char *desc,  SAMR_Q_ENUM_DOM_GROUPS *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_open_group(char *desc, SAMR_Q_OPEN_GROUP * q_u,
+			  prs_struct *ps, int depth)
 {
-	if (q_e == NULL)
+	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
+	prs_debug(ps, depth, desc, "samr_io_q_open_group");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
+	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
 		return False;
 
-	if(!prs_uint16("switch_level", ps, depth, &q_e->switch_level))
+	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
 		return False;
-	if(!prs_uint16("unknown_0   ", ps, depth, &q_e->unknown_0))
+	if(!prs_uint32("rid_group", ps, depth, &q_u->rid_group))
 		return False;
-	if(!prs_uint32("start_idx   ", ps, depth, &q_e->start_idx))
+
+	return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_open_group(char *desc, SAMR_R_OPEN_GROUP * r_u,
+			  prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
 		return False;
-	if(!prs_uint32("unknown_1   ", ps, depth, &q_e->unknown_1))
+
+	prs_debug(ps, depth, desc, "samr_io_r_open_group");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("max_size    ", ps, depth, &q_e->max_size))
+
+	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
 		return False;
 
-	if(!prs_align(ps))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
-
 /*******************************************************************
- Inits a SAMR_R_ENUM_DOM_GROUPS structure.
+inits a GROUP_INFO1 structure.
 ********************************************************************/
 
-void init_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
-		uint32 start_idx, uint32 num_sam_entries,
-		SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES],
-		uint32 status)
+void init_samr_group_info1(GROUP_INFO1 * gr1,
+			   char *acct_name, char *acct_desc,
+			   uint32 num_members)
 {
-	int i;
-	int entries_added;
+	int desc_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+	int acct_len = acct_name != NULL ? strlen(acct_name) : 0;
 
-	DEBUG(5,("init_samr_r_enum_dom_groups\n"));
+	DEBUG(5, ("init_samr_group_info1\n"));
 
-	if (num_sam_entries >= MAX_SAM_ENTRIES) {
-		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d\n", 
-			 num_sam_entries));
-	}
+	init_uni_hdr(&gr1->hdr_acct_name, acct_len);
 
-	if (status == 0x0) {
-		for (i = start_idx, entries_added = 0; i < num_sam_entries; i++) {
-			init_sam_entry3(&r_u->sam[entries_added],
-			                start_idx + entries_added + 1,
-			                pass[i].uni_user_name.uni_str_len,
-			                pass[i].uni_acct_desc.uni_str_len,
-			                pass[i].user_rid);
-
-			copy_unistr2(&r_u->str[entries_added].uni_grp_name, 
-						&pass[i].uni_user_name);
-			copy_unistr2(&r_u->str[entries_added].uni_grp_desc, 
-						&pass[i].uni_acct_desc);
-
-			entries_added++;
-		}
+	gr1->unknown_1 = 0x3;
+	gr1->num_members = num_members;
 
-		if (entries_added > 0) {
-			r_u->unknown_0 = 0x0000492;
-			r_u->unknown_1 = 0x000049a;
-		} else {
-			r_u->unknown_0 = 0x0;
-			r_u->unknown_1 = 0x0;
-		}
-		r_u->switch_level  = 3;
-		r_u->num_entries   = entries_added;
-		r_u->ptr_entries   = 1;
-		r_u->num_entries2  = entries_added;
-	} else {
-		r_u->switch_level = 0;
-	}
+	init_uni_hdr(&gr1->hdr_acct_desc, desc_len);
 
-	r_u->status = status;
+	init_unistr2(&gr1->uni_acct_name, acct_name, acct_len);
+	init_unistr2(&gr1->uni_acct_desc, acct_desc, desc_len);
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_enum_dom_groups(char *desc,  SAMR_R_ENUM_DOM_GROUPS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_group_info1(char *desc, GROUP_INFO1 * gr1,
+			 prs_struct *ps, int depth)
 {
-	int i;
-
-	if (r_u == NULL)
+	if (gr1 == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
+	prs_debug(ps, depth, desc, "samr_io_group_info1");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("unknown_0    ", ps, depth, &r_u->unknown_0))
+	if(!smb_io_unihdr("hdr_acct_name", &gr1->hdr_acct_name, ps, depth))
 		return False;
-	if(!prs_uint32("unknown_1    ", ps, depth, &r_u->unknown_1))
+
+	if(!prs_uint32("unknown_1", ps, depth, &gr1->unknown_1))
 		return False;
-	if(!prs_uint32("switch_level ", ps, depth, &r_u->switch_level))
+	if(!prs_uint32("num_members", ps, depth, &gr1->num_members))
 		return False;
 
-	if (r_u->switch_level != 0) {
-		if(!prs_uint32("num_entries  ", ps, depth, &r_u->num_entries))
-			return False;
-		if(!prs_uint32("ptr_entries  ", ps, depth, &r_u->ptr_entries))
-			return False;
+	if(!smb_io_unihdr("hdr_acct_desc", &gr1->hdr_acct_desc, ps, depth))
+		return False;
 
-		if(!prs_uint32("num_entries2 ", ps, depth, &r_u->num_entries2))
-			return False;
+	if(!smb_io_unistr2("uni_acct_name", &gr1->uni_acct_name,
+			   gr1->hdr_acct_name.buffer, ps, depth))
+		return False;
 
-		SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+	if(!smb_io_unistr2("uni_acct_desc", &gr1->uni_acct_desc,
+			   gr1->hdr_acct_desc.buffer, ps, depth))
+		return False;
 
-		for (i = 0; i < r_u->num_entries; i++) {
-			if(!sam_io_sam_entry3("", &r_u->sam[i], ps, depth))
-				return False;
-		}
+	return True;
+}
 
-		for (i = 0; i < r_u->num_entries; i++) {
-			if(!sam_io_sam_str3 ("", &r_u->str[i],
-			                     r_u->sam[i].hdr_grp_name.buffer,
-			                     r_u->sam[i].hdr_grp_desc.buffer,
-			                     ps, depth))
-				return False;
-		}
-	}
+/*******************************************************************
+inits a GROUP_INFO4 structure.
+********************************************************************/
 
-	if(!prs_uint32("status", ps, depth, &r_u->status))
+void init_samr_group_info4(GROUP_INFO4 * gr4, char *acct_desc)
+{
+	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+
+	DEBUG(5, ("init_samr_group_info4\n"));
+
+	init_uni_hdr(&gr4->hdr_acct_desc, acct_len);
+	init_unistr2(&gr4->uni_acct_desc, acct_desc, acct_len);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_group_info4(char *desc, GROUP_INFO4 * gr4,
+			 prs_struct *ps, int depth)
+{
+	if (gr4 == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_group_info4");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!smb_io_unihdr("hdr_acct_desc", &gr4->hdr_acct_desc, ps, depth))
+		return False;
+	if(!smb_io_unistr2("uni_acct_desc", &gr4->uni_acct_desc,
+			   gr4->hdr_acct_desc.buffer, ps, depth))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+static BOOL samr_group_info_ctr(char *desc, GROUP_INFO_CTR * ctr,
+				prs_struct *ps, int depth)
+{
+	if (ctr == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_group_info_ctr");
+	depth++;
+
+	if(!prs_uint16("switch_value1", ps, depth, &ctr->switch_value1))
+		return False;
+	if(!prs_uint16("switch_value2", ps, depth, &ctr->switch_value2))
 		return False;
 
+	switch (ctr->switch_value1) {
+	case 1:
+		if(!samr_io_group_info1("group_info1",
+				  &ctr->group.info1, ps, depth))
+			return False;
+		break;
+	case 4:
+		if(!samr_io_group_info4("group_info4",
+				  &ctr->group.info4, ps, depth))
+			return False;
+		break;
+	default:
+		DEBUG(0,("samr_group_info_ctr: unsupported switch level\n"));
+		break;
+	}
+
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_Q_QUERY_ALIASINFO structure.
+inits a SAMR_Q_CREATE_DOM_GROUP structure.
 ********************************************************************/
 
-void init_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_e,
-				POLICY_HND *pol,
-				uint16 switch_level)
+void init_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP * q_e,
+				  POLICY_HND *pol, char *acct_desc,
+				  uint32 access_mask)
 {
-	DEBUG(5,("init_q_query_aliasinfo\n"));
+	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
 
-	memcpy(&q_e->pol, pol, sizeof(*pol));
+	DEBUG(5, ("init_samr_q_create_dom_group\n"));
 
-	q_e->switch_level = switch_level;
+	q_e->pol = *pol;
+
+	init_uni_hdr(&q_e->hdr_acct_desc, acct_len);
+	init_unistr2(&q_e->uni_acct_desc, acct_desc, acct_len);
+
+	q_e->access_mask = access_mask;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_create_dom_group(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_query_aliasinfo");
+	prs_debug(ps, depth, desc, "samr_io_q_create_dom_group");
 	depth++;
 
 	if(!prs_align(ps))
@@ -2001,241 +2119,315 @@ BOOL samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_str
 
 	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
+
+	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_uint16("switch_level", ps, depth, &q_e->switch_level))
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("access", ps, depth, &q_e->access_mask))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_QUERY_ALIASINFO structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u, uint32 switch_level,
-				 char* alias, char* alias_desc)
-				 
+BOOL samr_io_r_create_dom_group(char *desc, SAMR_R_CREATE_DOM_GROUP * r_u,
+				prs_struct *ps, int depth)
 {
-  int alias_desc_len, alias_len;
+	if (r_u == NULL)
+		return False;
 
-  if(r_u == NULL)
-    return;
+	prs_debug(ps, depth, desc, "samr_io_r_create_dom_group");
+	depth++;
 
-  alias_len = alias?strlen(alias)+1:0;
-  alias_desc_len = alias_desc?strlen(alias_desc)+1:0;
+	if(!prs_align(ps))
+		return False;
 
-  DEBUG(5,("init_samr_r_query_aliasinfo\n"));
+	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
+		return False;
 
-  r_u->switch_value = switch_level;
+	if(!prs_uint32("rid   ", ps, depth, &r_u->rid))
+		return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
 
-  if(r_u->status == 0)
-    {
-      switch(switch_level)
-	{
-	case 1: 
-	  {
-	    r_u->ptr = 1;
-	    init_uni_hdr(&r_u->alias.info1.hdr_alias_name, alias_len);
-	    init_unistr2(&r_u->alias.info1.uni_alias_name, alias, alias_len);
-	    r_u->alias.info1.switch_value_1 = switch_level;
-	    init_uni_hdr(&r_u->alias.info1.hdr_alias_desc, alias_desc_len);
-	    init_unistr2(&r_u->alias.info1.uni_alias_desc, alias_desc, alias_desc_len);
-	    break;
-	  }
-	case 3:
-	  {
-	    r_u->ptr = 1;
-	    init_uni_hdr(&r_u->alias.info3.hdr_acct_desc, alias_desc_len);
-	    init_unistr2(&r_u->alias.info3.uni_acct_desc, alias_desc, alias_desc_len);
-	    break;
-	  }
-	default:
-	  {
-	    r_u->status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
-	  }
-	}
-    }
+	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.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_q_delete_dom_group(char *desc, SAMR_Q_DELETE_DOM_GROUP * q_u,
+				prs_struct *ps, int depth)
 {
-  if (r_u == NULL)
-    return False;
+	if (q_u == NULL)
+		return False;
 
-  prs_debug(ps, depth, desc, "samr_io_r_query_aliasinfo");
-  depth++;
+	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
+	depth++;
 
-  if(!prs_align(ps))
-    return False;
+	if(!prs_align(ps))
+		return False;
 
-  if(!prs_uint32("ptr         ", ps, depth, &r_u->ptr))
-    return False;
-	
-  if (r_u->ptr != 0) {
-    if(!prs_uint16("switch_value", ps, depth, &r_u->switch_value))
-      return False;
-    if(!prs_align(ps))
-      return False;
-
-    if (r_u->switch_value != 0) {
-      switch (r_u->switch_value) {
-      case 1:
-	smb_io_unihdr("",&r_u->alias.info1.hdr_alias_name, ps, depth);
-	prs_uint32("switch_value_1", ps, depth, &r_u->alias.info1.switch_value_1);
-	smb_io_unihdr("",&r_u->alias.info1.hdr_alias_desc, ps, depth);
-	
-	smb_io_unistr2("", &r_u->alias.info1.uni_alias_name, 
-		       r_u->alias.info1.hdr_alias_name.buffer, ps, depth);
-	smb_io_unistr2("", &r_u->alias.info1.uni_alias_desc,
-		       r_u->alias.info1.hdr_alias_desc.buffer, ps, depth);
-	break;
-      case 3:
-	if(!smb_io_unihdr ("", &r_u->alias.info3.hdr_acct_desc, ps, depth))
-	  return False;
-	if(!smb_io_unistr2("", &r_u->alias.info3.uni_acct_desc, 
-			   r_u->alias.info3.hdr_acct_desc.buffer, ps, depth))
-	  return False;
-	break;
-      default:
-	DEBUG(4,("samr_io_r_query_aliasinfo: unsupported switch level\n"));
-	break;
-      }
-    }
-  }
+	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(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(!prs_align(ps))
+		return False;
 
-  if(!prs_uint32("status", ps, depth, &r_u->status))
-    return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
 
-  return True;
+	return True;
 }
 
 /*******************************************************************
- Reads or writes a SAMR_Q_LOOKUP_IDS structure.
+inits a SAMR_Q_DEL_GROUPMEM structure.
 ********************************************************************/
 
-BOOL samr_io_q_lookup_ids(char *desc,  SAMR_Q_LOOKUP_IDS *q_u, prs_struct *ps, int depth)
+void init_samr_q_del_groupmem(SAMR_Q_DEL_GROUPMEM * q_e,
+			      POLICY_HND *pol, uint32 rid)
 {
-	fstring tmp;
-	int i;
+	DEBUG(5, ("init_samr_q_del_groupmem\n"));
 
-	if (q_u == NULL)
+	q_e->pol = *pol;
+	q_e->rid = rid;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_del_groupmem(char *desc, SAMR_Q_DEL_GROUPMEM * q_e,
+			    prs_struct *ps, int depth)
+{
+	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_lookup_ids");
+	prs_debug(ps, depth, desc, "samr_io_q_del_groupmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &(q_u->pol), ps, depth))
+	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
+
+	if(!prs_uint32("rid", ps, depth, &q_e->rid))
 		return False;
 
-	if(!prs_uint32("num_sids1", ps, depth, &q_u->num_sids1))
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_DEL_GROUPMEM structure.
+********************************************************************/
+
+void init_samr_r_del_groupmem(SAMR_R_DEL_GROUPMEM * r_u, POLICY_HND *pol,
+			      uint32 status)
+{
+	DEBUG(5, ("init_samr_r_del_groupmem\n"));
+
+	r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_del_groupmem(char *desc, SAMR_R_DEL_GROUPMEM * r_u,
+			    prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
 		return False;
-	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
+
+	prs_debug(ps, depth, desc, "samr_io_r_del_groupmem");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("num_sids2", ps, depth, &q_u->num_sids2))
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
-	SMB_ASSERT_ARRAY(q_u->ptr_sid, q_u->num_sids2);
+	return True;
+}
 
-	for (i = 0; i < q_u->num_sids2; i++) {
-		slprintf(tmp, sizeof(tmp) - 1, "ptr[%02d]", i);
-		if(!prs_uint32(tmp, ps, depth, &q_u->ptr_sid[i]))
-			return False;
-	}
+/*******************************************************************
+inits a SAMR_Q_ADD_GROUPMEM structure.
+********************************************************************/
 
-	for (i = 0; i < q_u->num_sids2; i++) {
-		if (q_u->ptr_sid[i] != 0) {
-			slprintf(tmp, sizeof(tmp)-1, "sid[%02d]", i);
-			if(!smb_io_dom_sid2(tmp, &q_u->sid[i], ps, depth))
-				return False;
-		}
-	}
+void init_samr_q_add_groupmem(SAMR_Q_ADD_GROUPMEM * q_e,
+			      POLICY_HND *pol, uint32 rid)
+{
+	DEBUG(5, ("init_samr_q_add_groupmem\n"));
+
+	q_e->pol = *pol;
+	q_e->rid = rid;
+	q_e->unknown = 0x0005;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_add_groupmem(char *desc, SAMR_Q_ADD_GROUPMEM * q_e,
+			    prs_struct *ps, int depth)
+{
+	if (q_e == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_add_groupmem");
+	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
+	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
+		return False;
+
+	if(!prs_uint32("rid    ", ps, depth, &q_e->rid))
+		return False;
+	if(!prs_uint32("unknown", ps, depth, &q_e->unknown))
+		return False;
+
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_LOOKUP_IDS structure.
+inits a SAMR_R_ADD_GROUPMEM structure.
 ********************************************************************/
 
-void init_samr_r_lookup_ids(SAMR_R_LOOKUP_IDS *r_u,
-		uint32 num_rids, uint32 *rid, uint32 status)
+void init_samr_r_add_groupmem(SAMR_R_ADD_GROUPMEM * r_u, POLICY_HND *pol,
+			      uint32 status)
 {
-	int i;
+	DEBUG(5, ("init_samr_r_add_groupmem\n"));
 
-	DEBUG(5,("init_samr_r_lookup_ids\n"));
+	r_u->status = status;
+}
 
-	if (status == 0x0) {
-		r_u->num_entries  = num_rids;
-		r_u->ptr = 1;
-		r_u->num_entries2 = num_rids;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-		SMB_ASSERT_ARRAY(r_u->rid, num_rids);
+BOOL samr_io_r_add_groupmem(char *desc, SAMR_R_ADD_GROUPMEM * r_u,
+			    prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
+		return False;
 
-		for (i = 0; i < num_rids; i++) {
-			r_u->rid[i] = rid[i];
-		}
-	} else {
-		r_u->num_entries  = 0;
-		r_u->ptr = 0;
-		r_u->num_entries2 = 0;
-	}
+	prs_debug(ps, depth, desc, "samr_io_r_add_groupmem");
+	depth++;
 
-	r_u->status = status;
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_Q_SET_GROUPINFO structure.
 ********************************************************************/
 
-BOOL samr_io_r_lookup_ids(char *desc,  SAMR_R_LOOKUP_IDS *r_u, prs_struct *ps, int depth)
+void init_samr_q_set_groupinfo(SAMR_Q_SET_GROUPINFO * q_e,
+			       POLICY_HND *pol, GROUP_INFO_CTR * ctr)
 {
-	fstring tmp;
-	int i;
+	DEBUG(5, ("init_samr_q_set_groupinfo\n"));
 
-	if (r_u == NULL)
+	q_e->pol = *pol;
+	q_e->ctr = ctr;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_set_groupinfo(char *desc, SAMR_Q_SET_GROUPINFO * q_e,
+			     prs_struct *ps, int depth)
+{
+	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_lookup_ids");
+	prs_debug(ps, depth, desc, "samr_io_q_set_groupinfo");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_entries", ps, depth, &r_u->num_entries))
+	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
 		return False;
-	if(!prs_uint32("ptr        ", ps, depth, &r_u->ptr))
+	
+	if(!samr_group_info_ctr("ctr", q_e->ctr, ps, depth))
 		return False;
-	if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_SET_GROUPINFO structure.
+********************************************************************/
+
+void init_samr_r_set_groupinfo(SAMR_R_SET_GROUPINFO * r_u, uint32 status)
+{
+	DEBUG(5, ("init_samr_r_set_groupinfo\n"));
+
+	r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_set_groupinfo(char *desc, SAMR_R_SET_GROUPINFO * r_u,
+			     prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
 		return False;
 
-	if (r_u->num_entries != 0) {
-		SMB_ASSERT_ARRAY(r_u->rid, r_u->num_entries2);
+	prs_debug(ps, depth, desc, "samr_io_r_set_groupinfo");
+	depth++;
 
-		for (i = 0; i < r_u->num_entries2; i++) {
-			slprintf(tmp, sizeof(tmp)-1, "rid[%02d]", i);
-			if(!prs_uint32(tmp, ps, depth, &r_u->rid[i]))
-				return False;
-		}
-	}
+	if(!prs_align(ps))
+		return False;
 
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
@@ -2244,145 +2436,214 @@ BOOL samr_io_r_lookup_ids(char *desc,  SAMR_R_LOOKUP_IDS *r_u, prs_struct *ps, i
 }
 
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_Q_QUERY_GROUPINFO structure.
 ********************************************************************/
 
-BOOL samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth)
+void init_samr_q_query_groupinfo(SAMR_Q_QUERY_GROUPINFO * q_e,
+				 POLICY_HND *pol, uint16 switch_level)
 {
-	int i;
+	DEBUG(5, ("init_samr_q_query_groupinfo\n"));
 
-	if (q_u == NULL)
-		return False;
+	q_e->pol = *pol;
 
-	prs_debug(ps, depth, desc, "samr_io_q_lookup_names");
-	depth++;
+	q_e->switch_level = switch_level;
+}
 
-	prs_align(ps);
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
+BOOL samr_io_q_query_groupinfo(char *desc, SAMR_Q_QUERY_GROUPINFO * q_e,
+			       prs_struct *ps, int depth)
+{
+	if (q_e == NULL)
 		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_query_groupinfo");
+	depth++;
+
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_names1", ps, depth, &q_u->num_names1))
+	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
 		return False;
-	if(!prs_uint32("flags     ", ps, depth, &q_u->flags))
+
+	if(!prs_uint16("switch_level", ps, depth, &q_e->switch_level))
 		return False;
-	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_QUERY_GROUPINFO structure.
+********************************************************************/
+
+void init_samr_r_query_groupinfo(SAMR_R_QUERY_GROUPINFO * r_u,
+				 GROUP_INFO_CTR * ctr, uint32 status)
+{
+	DEBUG(5, ("init_samr_r_query_groupinfo\n"));
+
+	r_u->ptr = (status == 0x0 && ctr != NULL) ? 1 : 0;
+	r_u->ctr = ctr;
+	r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_query_groupinfo(char *desc, SAMR_R_QUERY_GROUPINFO * r_u,
+			       prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
 		return False;
-	if(!prs_uint32("num_names2", ps, depth, &q_u->num_names2))
+
+	prs_debug(ps, depth, desc, "samr_io_r_query_groupinfo");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
 
-	SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2);
+	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
+		return False;
 
-	for (i = 0; i < q_u->num_names2; i++) {
-		if(!smb_io_unihdr ("", &q_u->hdr_name[i], ps, depth))
-			return False;
-	}
-	for (i = 0; i < q_u->num_names2; i++) {
-		if(!smb_io_unistr2("", &q_u->uni_name[i], q_u->hdr_name[i].buffer, ps, depth))
+	if (r_u->ptr != 0) {
+		if(!samr_group_info_ctr("ctr", r_u->ctr, ps, depth))
 			return False;
 	}
 
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
 	return True;
 }
 
+/*******************************************************************
+inits a SAMR_Q_QUERY_GROUPMEM structure.
+********************************************************************/
+
+void init_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM * q_c, POLICY_HND *hnd)
+{
+	DEBUG(5, ("init_samr_q_query_groupmem\n"));
+
+	q_c->group_pol = *hnd;
+}
 
 /*******************************************************************
- Inits a SAMR_R_LOOKUP_NAMES structure.
+reads or writes a structure.
 ********************************************************************/
-void init_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
-			uint32 num_rids, uint32 *rid, enum SID_NAME_USE *type, uint32 status)
+
+BOOL samr_io_q_query_groupmem(char *desc, SAMR_Q_QUERY_GROUPMEM * q_u,
+			      prs_struct *ps, int depth)
 {
-	int i;
+	if (q_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_query_groupmem");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!smb_io_pol_hnd("group_pol", &q_u->group_pol, ps, depth))
+		return False;
 
-	DEBUG(5,("init_samr_r_lookup_names\n"));
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_QUERY_GROUPMEM structure.
+********************************************************************/
+
+void init_samr_r_query_groupmem(SAMR_R_QUERY_GROUPMEM * r_u,
+				uint32 num_entries, uint32 *rid,
+				uint32 *attr, uint32 status)
+{
+	DEBUG(5, ("init_samr_r_query_groupmem\n"));
 
 	if (status == 0x0) {
-		r_u->num_types1 = num_rids;
-		r_u->ptr_types  = 1;
-		r_u->num_types2 = num_rids;
+		r_u->ptr = 1;
+		r_u->num_entries = num_entries;
 
-		r_u->num_rids1 = num_rids;
-		r_u->ptr_rids  = 1;
-		r_u->num_rids2 = num_rids;
+		r_u->ptr_attrs = attr != NULL ? 1 : 0;
+		r_u->ptr_rids = rid != NULL ? 1 : 0;
 
-		SMB_ASSERT_ARRAY(r_u->rid, num_rids);
+		r_u->num_rids = num_entries;
+		r_u->rid = rid;
 
-		for (i = 0; i < num_rids; i++) {
-			r_u->rid [i] = rid [i];
-			r_u->type[i] = type[i];
-		}
+		r_u->num_attrs = num_entries;
+		r_u->attr = attr;
 	} else {
-		r_u->num_types1 = 0;
-		r_u->ptr_types  = 0;
-		r_u->num_types2 = 0;
-
-		r_u->num_rids1 = 0;
-		r_u->ptr_rids  = 0;
-		r_u->num_rids2 = 0;
+		r_u->ptr = 0;
+		r_u->num_entries = 0;
 	}
 
 	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_groupmem(char *desc, SAMR_R_QUERY_GROUPMEM * r_u,
+			      prs_struct *ps, int depth)
 {
-	int i;
-	fstring tmp;
+	uint32 i;
 
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_lookup_names");
+	if (UNMARSHALLING(ps))
+		ZERO_STRUCTP(r_u);
+
+	prs_debug(ps, depth, desc, "samr_io_r_query_groupmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_rids1", ps, depth, &r_u->num_rids1))
+	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
 		return False;
-	if(!prs_uint32("ptr_rids ", ps, depth, &r_u->ptr_rids ))
+	if(!prs_uint32("num_entries ", ps, depth, &r_u->num_entries))
 		return False;
 
-	if (r_u->ptr_rids != 0) {
-		if(!prs_uint32("num_rids2", ps, depth, &r_u->num_rids2))
+	if (r_u->ptr != 0) {
+		if(!prs_uint32("ptr_rids ", ps, depth, &r_u->ptr_rids))
 			return False;
-
-		if (r_u->num_rids2 != r_u->num_rids1) {
-			/* RPC fault */
+		if(!prs_uint32("ptr_attrs", ps, depth, &r_u->ptr_attrs))
 			return False;
-		}
 
-		for (i = 0; i < r_u->num_rids2; i++) {
-			slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
-			if(!prs_uint32(tmp, ps, depth, &r_u->rid[i]))
+		if (r_u->ptr_rids != 0)	{
+			if(!prs_uint32("num_rids", ps, depth, &r_u->num_rids))
 				return False;
-		}
-	}
-
-	if(!prs_uint32("num_types1", ps, depth, &r_u->num_types1))
-		return False;
-	if(!prs_uint32("ptr_types ", ps, depth, &r_u->ptr_types))
-		return False;
-
-	if (r_u->ptr_types != 0) {
-		if(!prs_uint32("num_types2", ps, depth, &r_u->num_types2))
-			return False;
+			if (UNMARSHALLING(ps) && r_u->num_rids != 0) {
+				r_u->rid = (uint32 *)prs_alloc_mem(ps,sizeof(r_u->rid[0])*r_u->num_rids);
+				if (r_u->rid == NULL)
+					return False;
+			}
 
-		if (r_u->num_types2 != r_u->num_types1) {
-			/* RPC fault */
-			return False;
+			for (i = 0; i < r_u->num_rids; i++) {
+				if(!prs_uint32("", ps, depth, &r_u->rid[i]))
+					return False;
+			}
 		}
 
-		for (i = 0; i < r_u->num_types2; i++) {
-			slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
-			if(!prs_uint32(tmp, ps, depth, &r_u->type[i]))
+		if (r_u->ptr_attrs != 0) {
+			if(!prs_uint32("num_attrs", ps, depth, &r_u->num_attrs))
 				return False;
+
+			if (UNMARSHALLING(ps) && r_u->num_attrs != 0) {
+				r_u->attr = (uint32 *)prs_alloc_mem(ps,sizeof(r_u->attr[0])*r_u->num_attrs);
+				if (r_u->attr == NULL)
+					return False;
+			}
+
+			for (i = 0; i < r_u->num_attrs; i++) {
+				if(!prs_uint32("", ps, depth, &r_u->attr[i]))
+					return False;
+			}
 		}
 	}
 
@@ -2393,18 +2654,28 @@ BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 }
 
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_Q_QUERY_USERGROUPS structure.
 ********************************************************************/
 
-BOOL samr_io_q_lookup_rids(char *desc, SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps, int depth)
+void init_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS * q_u,
+				  POLICY_HND *hnd)
 {
-	int i;
-	fstring tmp;
+	DEBUG(5, ("init_samr_q_query_usergroups\n"));
+
+	q_u->pol = *hnd;
+}
 
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_query_usergroups(char *desc, SAMR_Q_QUERY_USERGROUPS * q_u,
+				prs_struct *ps, int depth)
+{
 	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_lookup_rids");
+	prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
 	depth++;
 
 	if(!prs_align(ps))
@@ -2412,206 +2683,381 @@ BOOL samr_io_q_lookup_rids(char *desc, SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps,
 
 	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
-		return False;
 
-	if(!prs_uint32("num_gids1", ps, depth, &q_u->num_gids1))
-		return False;
-	if(!prs_uint32("rid      ", ps, depth, &q_u->rid))
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_QUERY_USERGROUPS structure.
+********************************************************************/
+
+void init_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS * r_u,
+				  uint32 num_gids, DOM_GID * gid,
+				  uint32 status)
+{
+	DEBUG(5, ("init_samr_r_query_usergroups\n"));
+
+	if (status == 0) {
+		r_u->ptr_0 = 1;
+		r_u->num_entries = num_gids;
+		r_u->ptr_1 = (num_gids != 0) ? 1 : 0;
+		r_u->num_entries2 = num_gids;
+
+		r_u->gid = gid;
+	} else {
+		r_u->ptr_0 = 0;
+		r_u->num_entries = 0;
+		r_u->ptr_1 = 0;
+		r_u->gid = NULL;
+	}
+
+	r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_gids(char *desc, uint32 *num_gids, DOM_GID ** gid,
+		  prs_struct *ps, int depth)
+{
+	uint32 i;
+	if (gid == NULL)
 		return False;
-	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
+
+	prs_debug(ps, depth, desc, "samr_io_gids");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("num_gids2", ps, depth, &q_u->num_gids2))
+
+	if(!prs_uint32("num_gids", ps, depth, num_gids))
 		return False;
 
-	SMB_ASSERT_ARRAY(q_u->gid, q_u->num_gids2);
+	if ((*num_gids) != 0) {
+		if (UNMARSHALLING(ps)) {
+			(*gid) = (DOM_GID *)prs_alloc_mem(ps,sizeof(DOM_GID)*(*num_gids));
+		}
 
-	for (i = 0; i < q_u->num_gids2; i++) {
-		slprintf(tmp, sizeof(tmp) - 1, "gid[%02d]  ", i);
-		if(!prs_uint32(tmp, ps, depth, &q_u->gid[i]))
+		if ((*gid) == NULL) {
 			return False;
+		}
+
+		for (i = 0; i < (*num_gids); i++) {
+			if(!smb_io_gid("gids", &(*gid)[i], ps, depth))
+				return False;
+		}
 	}
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_UNKNOWN_12 structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
-		uint32 num_aliases, fstring *als_name, uint32 *num_als_usrs,
-		uint32 status)
+BOOL samr_io_r_query_usergroups(char *desc, SAMR_R_QUERY_USERGROUPS * r_u,
+				prs_struct *ps, int depth)
 {
-	int i;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("init_samr_r_lookup_rids\n"));
+	prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
+	depth++;
 
-	if (status == 0x0) {
-		r_u->num_aliases1 = num_aliases;
-		r_u->ptr_aliases  = 1;
-		r_u->num_aliases2 = num_aliases;
+	if(!prs_align(ps))
+		return False;
 
-		r_u->num_als_usrs1 = num_aliases;
-		r_u->ptr_als_usrs  = 1;
-		r_u->num_als_usrs2 = num_aliases;
+	if(!prs_uint32("ptr_0       ", ps, depth, &r_u->ptr_0))
+		return False;
 
-		SMB_ASSERT_ARRAY(r_u->hdr_als_name, num_aliases);
+	if (r_u->ptr_0 != 0) {
+		if(!prs_uint32("num_entries ", ps, depth, &r_u->num_entries))
+			return False;
+		if(!prs_uint32("ptr_1       ", ps, depth, &r_u->ptr_1))
+			return False;
 
-		for (i = 0; i < num_aliases; i++) {
-			int als_len = als_name[i] != NULL ? strlen(als_name[i])+1 : 0;
-			init_uni_hdr(&r_u->hdr_als_name[i], als_len);
-			init_unistr2(&r_u->uni_als_name[i], als_name[i], als_len);
-			r_u->num_als_usrs[i] = num_als_usrs[i];
+		if (r_u->num_entries != 0 && r_u->ptr_1 != 0) {
+			if(!samr_io_gids("gids", &r_u->num_entries2, &r_u->gid, ps, depth))
+				return False;
 		}
-	} else {
-		r_u->num_aliases1 = num_aliases;
-		r_u->ptr_aliases  = 0;
-		r_u->num_aliases2 = num_aliases;
-
-		r_u->num_als_usrs1 = num_aliases;
-		r_u->ptr_als_usrs  = 0;
-		r_u->num_als_usrs2 = num_aliases;
 	}
 
-	r_u->status = status;
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+	  return False;
+
+	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_Q_ENUM_DOMAINS structure.
 ********************************************************************/
 
-BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth)
+void init_samr_q_enum_domains(SAMR_Q_ENUM_DOMAINS * q_e,
+			      POLICY_HND *pol,
+			      uint32 start_idx, uint32 size)
 {
-	int i;
-	fstring tmp;
+	DEBUG(5, ("init_samr_q_enum_domains\n"));
 
-	if (r_u == NULL)
+	q_e->pol = *pol;
+
+	q_e->start_idx = start_idx;
+	q_e->max_size = size;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_enum_domains(char *desc, SAMR_Q_ENUM_DOMAINS * q_e,
+			    prs_struct *ps, int depth)
+{
+	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_lookup_rids");
+	prs_debug(ps, depth, desc, "samr_io_q_enum_domains");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("num_aliases1", ps, depth, &r_u->num_aliases1))
+	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
 		return False;
-	if(!prs_uint32("ptr_aliases ", ps, depth, &r_u->ptr_aliases ))
+
+	if(!prs_uint32("start_idx", ps, depth, &q_e->start_idx))
 		return False;
-	if(!prs_uint32("num_aliases2", ps, depth, &r_u->num_aliases2))
+	if(!prs_uint32("max_size ", ps, depth, &q_e->max_size))
 		return False;
 
-	if (r_u->ptr_aliases != 0 && r_u->num_aliases1 != 0) {
-		SMB_ASSERT_ARRAY(r_u->hdr_als_name, r_u->num_aliases2);
+	return True;
+}
 
-		for (i = 0; i < r_u->num_aliases2; i++) {
-			slprintf(tmp, sizeof(tmp) - 1, "als_hdr[%02d]  ", i);
-			if(!smb_io_unihdr ("", &r_u->hdr_als_name[i], ps, depth))
-				return False;
-		}
-		for (i = 0; i < r_u->num_aliases2; i++) {
-			slprintf(tmp, sizeof(tmp) - 1, "als_str[%02d]  ", i);
-			if(!smb_io_unistr2("", &r_u->uni_als_name[i], r_u->hdr_als_name[i].buffer, ps, depth))
-				return False;
-			if(!prs_align(ps))
-				return False;
-		}
+/*******************************************************************
+inits a SAMR_R_ENUM_DOMAINS structure.
+********************************************************************/
+
+void init_samr_r_enum_domains(SAMR_R_ENUM_DOMAINS * r_u,
+			      uint32 next_idx, uint32 num_sam_entries)
+{
+	DEBUG(5, ("init_samr_r_enum_domains\n"));
+
+	r_u->next_idx = next_idx;
+
+	if (num_sam_entries != 0) {
+		r_u->ptr_entries1 = 1;
+		r_u->ptr_entries2 = 1;
+		r_u->num_entries2 = num_sam_entries;
+		r_u->num_entries3 = num_sam_entries;
+
+		r_u->num_entries4 = num_sam_entries;
+	} else {
+		r_u->ptr_entries1 = 0;
+		r_u->num_entries2 = num_sam_entries;
+		r_u->ptr_entries2 = 1;
 	}
+}
 
-	if(!prs_align(ps))
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS * r_u,
+			    prs_struct *ps, int depth)
+{
+	uint32 i;
+
+	if (r_u == NULL)
 		return False;
 
-	if(!prs_uint32("num_als_usrs1", ps, depth, &r_u->num_als_usrs1))
+	prs_debug(ps, depth, desc, "samr_io_r_enum_domains");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("ptr_als_usrs ", ps, depth, &r_u->ptr_als_usrs))
+
+	if(!prs_uint32("next_idx    ", ps, depth, &r_u->next_idx))
 		return False;
-	if(!prs_uint32("num_als_usrs2", ps, depth, &r_u->num_als_usrs2))
+	if(!prs_uint32("ptr_entries1", ps, depth, &r_u->ptr_entries1))
 		return False;
 
-	if (r_u->ptr_als_usrs != 0 && r_u->num_als_usrs1 != 0) {
-		SMB_ASSERT_ARRAY(r_u->num_als_usrs, r_u->num_als_usrs2);
+	if (r_u->ptr_entries1 != 0) {
+		if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
+			return False;
+		if(!prs_uint32("ptr_entries2", ps, depth, &r_u->ptr_entries2))
+			return False;
+		if(!prs_uint32("num_entries3", ps, depth, &r_u->num_entries3))
+			return False;
+
+		if (UNMARSHALLING(ps)) {
+			r_u->sam = (SAM_ENTRY *)prs_alloc_mem(ps,sizeof(SAM_ENTRY)*r_u->num_entries2);
+			r_u->uni_dom_name = (UNISTR2 *)prs_alloc_mem(ps,sizeof(UNISTR2)*r_u->num_entries2);
+		}
+
+		if ((r_u->sam == NULL || r_u->uni_dom_name == NULL) && r_u->num_entries2 != 0) {
+			DEBUG(0, ("NULL pointers in SAMR_R_ENUM_DOMAINS\n"));
+			r_u->num_entries4 = 0;
+			r_u->status = NT_STATUS_MEMORY_NOT_ALLOCATED;
+			return False;
+		}
+
+		for (i = 0; i < r_u->num_entries2; i++)	{
+			fstring tmp;
+			slprintf(tmp, sizeof(tmp) - 1, "dom[%d]", i);
+			if(!sam_io_sam_entry(tmp, &r_u->sam[i], ps, depth))
+				return False;
+		}
 
-		for (i = 0; i < r_u->num_als_usrs2; i++) {
-			slprintf(tmp, sizeof(tmp) - 1, "als_usrs[%02d]  ", i);
-			if(!prs_uint32(tmp, ps, depth, &r_u->num_als_usrs[i]))
+		for (i = 0; i < r_u->num_entries2; i++)	{
+			fstring tmp;
+			slprintf(tmp, sizeof(tmp) - 1, "dom[%d]", i);
+			if(!smb_io_unistr2(tmp, &r_u->uni_dom_name[i],
+				       r_u->sam[i].hdr_name.buffer, ps,
+				       depth))
 				return False;
 		}
+
 	}
 
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
+		return False;
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
-
 /*******************************************************************
- Inits a SAMR_Q_OPEN_USER struct.
+inits a SAMR_Q_ENUM_DOM_GROUPS structure.
 ********************************************************************/
 
-void init_samr_q_open_user(SAMR_Q_OPEN_USER *q_u, POLICY_HND *pol,
-			   uint32 access_mask, uint32 rid)
+void init_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS * q_e,
+				 POLICY_HND *pol,
+				 uint32 start_idx, uint32 size)
 {
-	DEBUG(5,("init_samr_q_open_user\n"));
+	DEBUG(5, ("init_samr_q_enum_dom_groups\n"));
 
-	q_u->domain_pol = *pol;
-	q_u->access_mask = access_mask;
-	q_u->user_rid = rid;
+	q_e->pol = *pol;
+
+	q_e->start_idx = start_idx;
+	q_e->max_size = size;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_open_user(char *desc, SAMR_Q_OPEN_USER *q_u, 
-			 prs_struct *ps, int depth)
+BOOL samr_io_q_enum_dom_groups(char *desc, SAMR_Q_ENUM_DOM_GROUPS * q_e,
+			       prs_struct *ps, int depth)
 {
-	if (q_u == NULL)
+	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_open_user");
+	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
+	if(!smb_io_pol_hnd("pol", &(q_e->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))
+	if(!prs_uint32("start_idx", ps, depth, &q_e->start_idx))
 		return False;
-
-	if(!prs_align(ps))
+	if(!prs_uint32("max_size ", ps, depth, &q_e->max_size))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_R_ENUM_DOM_GROUPS structure.
+********************************************************************/
+
+void init_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS * r_u,
+				 uint32 next_idx, uint32 num_sam_entries)
+{
+	DEBUG(5, ("init_samr_r_enum_dom_groups\n"));
+
+	r_u->next_idx = next_idx;
+
+	if (num_sam_entries != 0) {
+		r_u->ptr_entries1 = 1;
+		r_u->ptr_entries2 = 1;
+		r_u->num_entries2 = num_sam_entries;
+		r_u->num_entries3 = num_sam_entries;
+
+		r_u->num_entries4 = num_sam_entries;
+	} else {
+		r_u->ptr_entries1 = 0;
+		r_u->num_entries2 = num_sam_entries;
+		r_u->ptr_entries2 = 1;
+	}
+}
+
+/*******************************************************************
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_open_user(char *desc,  SAMR_R_OPEN_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS * r_u,
+			       prs_struct *ps, int depth)
 {
+	uint32 i;
+
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_open_user");
+	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("user_pol", &r_u->user_pol, ps, depth))
+	if(!prs_uint32("next_idx    ", ps, depth, &r_u->next_idx))
 		return False;
-	if(!prs_align(ps))
+	if(!prs_uint32("ptr_entries1", ps, depth, &r_u->ptr_entries1))
 		return False;
 
+	if (r_u->ptr_entries1 != 0) {
+		if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
+			return False;
+		if(!prs_uint32("ptr_entries2", ps, depth, &r_u->ptr_entries2))
+			return False;
+		if(!prs_uint32("num_entries3", ps, depth, &r_u->num_entries3))
+			return False;
+
+		if (UNMARSHALLING(ps)) {
+			r_u->sam = (SAM_ENTRY *)prs_alloc_mem(ps,sizeof(SAM_ENTRY)*r_u->num_entries2);
+			r_u->uni_grp_name = (UNISTR2 *)prs_alloc_mem(ps,sizeof(UNISTR2)*r_u->num_entries2);
+		}
+
+		if ((r_u->sam == NULL || r_u->uni_grp_name == NULL) && r_u->num_entries2 != 0) {
+			DEBUG(0,
+			      ("NULL pointers in SAMR_R_ENUM_DOM_GROUPS\n"));
+			r_u->num_entries4 = 0;
+			r_u->status = NT_STATUS_MEMORY_NOT_ALLOCATED;
+			return False;
+		}
+
+		for (i = 0; i < r_u->num_entries2; i++)	{
+			if(!sam_io_sam_entry("", &r_u->sam[i], ps, depth))
+				return False;
+		}
+
+		for (i = 0; i < r_u->num_entries2; i++)	{
+			if(!smb_io_unistr2("", &r_u->uni_grp_name[i],
+				       r_u->sam[i].hdr_name.buffer, ps, depth))
+				return False;
+		}
+	}
+
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
+		return False;
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -2619,102 +3065,134 @@ BOOL samr_io_r_open_user(char *desc,  SAMR_R_OPEN_USER *r_u, prs_struct *ps, int
 }
 
 /*******************************************************************
- Inits a SAMR_Q_QUERY_USERGROUPS structure.
+inits a SAMR_Q_ENUM_DOM_ALIASES structure.
 ********************************************************************/
 
-void init_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
-				POLICY_HND *hnd)
+void init_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES * q_e,
+				  POLICY_HND *pol, uint32 start_idx,
+				  uint32 size)
 {
-	DEBUG(5,("init_samr_q_query_usergroups\n"));
+	DEBUG(5, ("init_samr_q_enum_dom_aliases\n"));
+
+	q_e->pol = *pol;
 
-	memcpy(&q_u->pol, hnd, sizeof(q_u->pol));
+	q_e->start_idx = start_idx;
+	q_e->max_size = size;
 }
 
+
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_enum_dom_aliases(char *desc, SAMR_Q_ENUM_DOM_ALIASES * q_e,
+				prs_struct *ps, int depth)
 {
-	if (q_u == NULL)
+	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
+	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_aliases");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
+	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
+
+	if(!prs_uint32("start_idx", ps, depth, &q_e->start_idx))
+		return False;
+	if(!prs_uint32("max_size ", ps, depth, &q_e->max_size))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_QUERY_USERGROUPS structure.
+inits a SAMR_R_ENUM_DOM_ALIASES structure.
 ********************************************************************/
 
-void init_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
-		uint32 num_gids, DOM_GID *gid, uint32 status)
+void init_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u, uint32 next_idx, uint32 num_sam_entries)
 {
-	DEBUG(5,("init_samr_r_query_usergroups\n"));
+	DEBUG(5, ("init_samr_r_enum_dom_aliases\n"));
 
-	if (status == 0x0) {
-		r_u->ptr_0        = 1;
-		r_u->num_entries  = num_gids;
-		r_u->ptr_1        = 1;
-		r_u->num_entries2 = num_gids;
+	r_u->next_idx = next_idx;
 
-		r_u->gid = gid;
+	if (num_sam_entries != 0) {
+		r_u->ptr_entries1 = 1;
+		r_u->ptr_entries2 = 1;
+		r_u->num_entries2 = num_sam_entries;
+		r_u->num_entries3 = num_sam_entries;
+
+		r_u->num_entries4 = num_sam_entries;
 	} else {
-		r_u->ptr_0       = 0;
-		r_u->num_entries = 0;
-		r_u->ptr_1       = 0;
+		r_u->ptr_entries1 = 0;
+		r_u->num_entries2 = num_sam_entries;
+		r_u->ptr_entries2 = 1;
 	}
-
-	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_query_usergroups(char *desc,  SAMR_R_QUERY_USERGROUPS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES * r_u,
+				prs_struct *ps, int depth)
 {
-	int i;
+	uint32 i;
 
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
+	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr_0       ", ps, depth, &r_u->ptr_0))
+	if(!prs_uint32("next_idx    ", ps, depth, &r_u->next_idx))
+		return False;
+	if(!prs_uint32("ptr_entries1", ps, depth, &r_u->ptr_entries1))
 		return False;
 
-	if (r_u->ptr_0 != 0) {
-		if(!prs_uint32("num_entries ", ps, depth, &r_u->num_entries))
+	if (r_u->ptr_entries1 != 0) {
+		if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
 			return False;
-		if(!prs_uint32("ptr_1       ", ps, depth, &r_u->ptr_1))
+		if(!prs_uint32("ptr_entries2", ps, depth, &r_u->ptr_entries2))
+			return False;
+		if(!prs_uint32("num_entries3", ps, depth, &r_u->num_entries3))
 			return False;
 
-		if (r_u->num_entries != 0) {
-			if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
+		if (UNMARSHALLING(ps) && (r_u->num_entries2 > 0)) {
+			r_u->sam = (SAM_ENTRY *)prs_alloc_mem(ps,sizeof(SAM_ENTRY)*r_u->num_entries2);
+			r_u->uni_grp_name = (UNISTR2 *)prs_alloc_mem(ps,sizeof(UNISTR2)*r_u->num_entries2);
+		}
+
+		if (r_u->num_entries2 != 0 && 
+		    (r_u->sam == NULL || r_u->uni_grp_name == NULL)) {
+			DEBUG(0,("NULL pointers in SAMR_R_ENUM_DOM_ALIASES\n"));
+			r_u->num_entries4 = 0;
+			r_u->status = NT_STATUS_MEMORY_NOT_ALLOCATED;
+			return False;
+		}
+
+		for (i = 0; i < r_u->num_entries2; i++) {
+			if(!sam_io_sam_entry("", &r_u->sam[i], ps, depth))
 				return False;
+		}
 
-			for (i = 0; i < r_u->num_entries2; i++) {
-				if(!smb_io_gid("", &r_u->gid[i], ps, depth))
-					return False;
-			}
+		for (i = 0; i < r_u->num_entries2; i++) {
+			if(!smb_io_unistr2("", &r_u->uni_grp_name[i],
+				       r_u->sam[i].hdr_name.buffer, ps,
+				       depth))
+				return False;
 		}
 	}
 
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
+		return False;
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -2722,464 +3200,531 @@ BOOL samr_io_r_query_usergroups(char *desc,  SAMR_R_QUERY_USERGROUPS *r_u, prs_s
 }
 
 /*******************************************************************
- Inits a SAMR_Q_QUERY_USERINFO structure.
+inits a ALIAS_INFO3 structure.
 ********************************************************************/
 
-void init_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
-				POLICY_HND *hnd, uint16 switch_value)
+void init_samr_alias_info3(ALIAS_INFO3 * al3, char *acct_desc)
 {
-	DEBUG(5,("init_samr_q_query_userinfo\n"));
+	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
 
-	memcpy(&q_u->pol, hnd, sizeof(q_u->pol));
-	q_u->switch_value = switch_value;
+	DEBUG(5, ("init_samr_alias_info3\n"));
+
+	init_uni_hdr(&al3->hdr_acct_desc, acct_len);
+	init_unistr2(&al3->uni_acct_desc, acct_desc, acct_len);
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_query_userinfo(char *desc,  SAMR_Q_QUERY_USERINFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_alias_info3(char *desc, ALIAS_INFO3 * al3,
+			 prs_struct *ps, int depth)
 {
-	if (q_u == NULL)
+	if (al3 == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_query_userinfo");
+	prs_debug(ps, depth, desc, "samr_io_alias_info3");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
+	if(!smb_io_unihdr("hdr_acct_desc", &al3->hdr_acct_desc, ps, depth))
 		return False;
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value)) /* 0x0015 or 0x0011 */
+	if(!smb_io_unistr2("uni_acct_desc", &al3->uni_acct_desc,
+		       al3->hdr_acct_desc.buffer, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a LOGON_HRS structure.
+reads or writes a structure.
 ********************************************************************/
 
-static BOOL sam_io_logon_hrs(char *desc,  LOGON_HRS *hrs, prs_struct *ps, int depth)
+BOOL samr_alias_info_ctr(char *desc, ALIAS_INFO_CTR * ctr,
+			 prs_struct *ps, int depth)
 {
-	if (hrs == NULL)
+	if (ctr == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_logon_hrs");
+	prs_debug(ps, depth, desc, "samr_alias_info_ctr");
 	depth++;
 
-	if(!prs_align(ps))
+	if(!prs_uint16("switch_value1", ps, depth, &ctr->switch_value1))
 		return False;
-	
-	if(!prs_uint32 ("len  ", ps, depth, &hrs->len))
+	if(!prs_uint16("switch_value2", ps, depth, &ctr->switch_value2))
 		return False;
 
-	if (hrs->len > 64) {
-		DEBUG(5,("sam_io_logon_hrs: truncating length\n"));
-		hrs->len = 64;
+	switch (ctr->switch_value1) {
+	case 3: 
+		if(!samr_io_alias_info3("alias_info3", &ctr->alias.info3, ps, depth))
+			return False;
+		break;
+	default:
+		DEBUG(0,("samr_alias_info_ctr: unsupported switch level\n"));
+		break;
 	}
 
-	if(!prs_uint8s (False, "hours", ps, depth, hrs->hours, hrs->len))
-		return False;
-
 	return True;
 }
 
 /*******************************************************************
- Inits a SAM_USER_INFO_10 structure.
+inits a SAMR_Q_QUERY_ALIASINFO structure.
 ********************************************************************/
 
-void init_sam_user_info10(SAM_USER_INFO_10 *usr,
-				uint32 acb_info)
+void init_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO * q_e,
+				 POLICY_HND *pol, uint16 switch_level)
 {
-	DEBUG(5,("init_sam_user_info10\n"));
+	DEBUG(5, ("init_samr_q_query_aliasinfo\n"));
 
-	usr->acb_info = acb_info;
+	q_e->pol = *pol;
+	q_e->switch_level = switch_level;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL sam_io_user_info10(char *desc,  SAM_USER_INFO_10 *usr, prs_struct *ps, int depth)
+BOOL samr_io_q_query_aliasinfo(char *desc, SAMR_Q_QUERY_ALIASINFO * q_e,
+			       prs_struct *ps, int depth)
 {
-	if (usr == NULL)
+	if (q_e == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_user_info10");
+	prs_debug(ps, depth, desc, "samr_io_q_query_aliasinfo");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("acb_info", ps, depth, &usr->acb_info))
+	if(!smb_io_pol_hnd("pol", &(q_e->pol), ps, depth))
+		return False;
+
+	if(!prs_uint16("switch_level", ps, depth, &q_e->switch_level))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAM_USER_INFO_11 structure.
+inits a SAMR_R_QUERY_ALIASINFO structure.
 ********************************************************************/
 
-void init_sam_user_info11(SAM_USER_INFO_11 *usr,
-				NTTIME *expiry,
-				char *mach_acct,
-				uint32 rid_user,
-				uint32 rid_group,
-				uint16 acct_ctrl)
-				
+void init_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO * r_u,
+				 ALIAS_INFO_CTR * ctr, uint32 status)
 {
-	int len_mach_acct;
+	DEBUG(5, ("init_samr_r_query_aliasinfo\n"));
 
-	DEBUG(5,("init_sam_user_info11\n"));
+	r_u->ptr = (status == 0x0 && ctr != NULL) ? 1 : 0;
+	r_u->ctr = *ctr;
+	r_u->status = status;
+}
 
-	len_mach_acct = strlen(mach_acct)+1;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-	memcpy(&usr->expiry,expiry, sizeof(usr->expiry)); /* expiry time or something? */
-	memset((char *)usr->padding_1, '\0', sizeof(usr->padding_1)); /* 0 - padding 24 bytes */
+BOOL samr_io_r_query_aliasinfo(char *desc, SAMR_R_QUERY_ALIASINFO * r_u,
+			       prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
+		return False;
 
-	init_uni_hdr(&usr->hdr_mach_acct, len_mach_acct);  /* unicode header for machine account */
-	usr->padding_2 = 0;               /* 0 - padding 4 bytes */
+	prs_debug(ps, depth, desc, "samr_io_r_query_aliasinfo");
+	depth++;
 
-	usr->ptr_1        = 1;            /* pointer */
-	memset((char *)usr->padding_3, '\0', sizeof(usr->padding_3)); /* 0 - padding 32 bytes */
-	usr->padding_4    = 0;            /* 0 - padding 4 bytes */
+	if(!prs_align(ps))
+		return False;
 
-	usr->ptr_2        = 1;            /* pointer */
-	usr->padding_5    = 0;            /* 0 - padding 4 bytes */
+	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
+		return False;
 
-	usr->ptr_3        = 1;          /* pointer */
-	memset((char *)usr->padding_6, '\0', sizeof(usr->padding_6)); /* 0 - padding 32 bytes */
+	if (r_u->ptr != 0) {
+		if(!samr_alias_info_ctr("ctr", &r_u->ctr, ps, depth))
+			return False;
+	}
 
-	usr->rid_user     = rid_user; 
-	usr->rid_group    = rid_group;
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
 
-	usr->acct_ctrl    = acct_ctrl;
-	usr->unknown_3    = 0x0000;
+	return True;
+}
 
-	usr->unknown_4    = 0x003f;       /* 0x003f      - 16 bit unknown */
-	usr->unknown_5    = 0x003c;       /* 0x003c      - 16 bit unknown */
+/*******************************************************************
+inits a SAMR_Q_SET_ALIASINFO structure.
+********************************************************************/
 
-	memset((char *)usr->padding_7, '\0', sizeof(usr->padding_7)); /* 0 - padding 16 bytes */
-	usr->padding_8    = 0;            /* 0 - padding 4 bytes */
-	
-	init_unistr2(&usr->uni_mach_acct, mach_acct, len_mach_acct);  /* unicode string for machine account */
+void init_samr_q_set_aliasinfo(SAMR_Q_SET_ALIASINFO * q_u,
+			       POLICY_HND *hnd, ALIAS_INFO_CTR * ctr)
+{
+	DEBUG(5, ("init_samr_q_set_aliasinfo\n"));
 
-	memset((char *)usr->padding_9, '\0', sizeof(usr->padding_9)); /* 0 - padding 48 bytes */
+	q_u->alias_pol = *hnd;
+	q_u->ctr = *ctr;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL sam_io_user_info11(char *desc,  SAM_USER_INFO_11 *usr, prs_struct *ps, int depth)
+BOOL samr_io_q_set_aliasinfo(char *desc, SAMR_Q_SET_ALIASINFO * q_u,
+			     prs_struct *ps, int depth)
 {
-	if (usr == NULL)
+	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_unknown_24");
+	prs_debug(ps, depth, desc, "samr_io_q_set_aliasinfo");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint8s (False, "padding_0", ps, depth, usr->padding_0, sizeof(usr->padding_0))) 
+	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
 		return False;
-
-	if(!smb_io_time("time", &(usr->expiry), ps, depth))
+	if(!samr_alias_info_ctr("ctr", &q_u->ctr, ps, depth))
 		return False;
 
-	if(!prs_uint8s (False, "padding_1", ps, depth, usr->padding_1, sizeof(usr->padding_1)))
-		return False;
+	return True;
+}
 
-	if(!smb_io_unihdr ("unihdr", &usr->hdr_mach_acct, ps, depth))
-		return False;
-	if(!prs_uint32(        "padding_2", ps, depth, &usr->padding_2))
-		return False;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-	if(!prs_uint32(        "ptr_1    ", ps, depth, &usr->ptr_1))
-		return False;
-	if(!prs_uint8s (False, "padding_3", ps, depth, usr->padding_3, sizeof(usr->padding_3)))
-		return False;
-	if(!prs_uint32(        "padding_4", ps, depth, &usr->padding_4))
+BOOL samr_io_r_set_aliasinfo(char *desc, SAMR_R_SET_ALIASINFO * r_u,
+			     prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
 		return False;
 
-	if(!prs_uint32(        "ptr_2    ", ps, depth, &usr->ptr_2))
-		return False;
-	if(!prs_uint32(        "padding_5", ps, depth, &usr->padding_5))
-		return False;
+	prs_debug(ps, depth, desc, "samr_io_r_set_aliasinfo");
+	depth++;
 
-	if(!prs_uint32(        "ptr_3    ", ps, depth, &usr->ptr_3))
+	if(!prs_align(ps))
 		return False;
-	if(!prs_uint8s(False, "padding_6", ps, depth, usr->padding_6, sizeof(usr->padding_6)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
-	if(!prs_uint32(        "rid_user ", ps, depth, &usr->rid_user))
-		return False;
-	if(!prs_uint32(        "rid_group", ps, depth, &usr->rid_group))
-		return False;
-	if(!prs_uint16(        "acct_ctrl", ps, depth, &usr->acct_ctrl))
-		return False;
-	if(!prs_uint16(        "unknown_3", ps, depth, &usr->unknown_3))
-		return False;
-	if(!prs_uint16(        "unknown_4", ps, depth, &usr->unknown_4))
-		return False;
-	if(!prs_uint16(        "unknown_5", ps, depth, &usr->unknown_5))
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_Q_QUERY_USERALIASES structure.
+********************************************************************/
+
+void init_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES * q_u,
+				   POLICY_HND *hnd,
+				   uint32 num_sids,
+				   uint32 *ptr_sid, DOM_SID2 * sid)
+{
+	DEBUG(5, ("init_samr_q_query_useraliases\n"));
+
+	q_u->pol = *hnd;
+
+	q_u->num_sids1 = num_sids;
+	q_u->ptr = 1;
+	q_u->num_sids2 = num_sids;
+
+	q_u->ptr_sid = ptr_sid;
+	q_u->sid = sid;
+}
+
+/*******************************************************************
+reads or writes a SAMR_Q_QUERY_USERALIASES structure.
+********************************************************************/
+
+BOOL samr_io_q_query_useraliases(char *desc, SAMR_Q_QUERY_USERALIASES * q_u,
+				 prs_struct *ps, int depth)
+{
+	fstring tmp;
+	uint32 i;
+
+	if (q_u == NULL)
 		return False;
 
-	if(!prs_uint8s (False, "padding_7", ps, depth, usr->padding_7, sizeof(usr->padding_7)))
+	prs_debug(ps, depth, desc, "samr_io_q_query_useraliases");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32(        "padding_8", ps, depth, &usr->padding_8))
+
+	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
 		return False;
-	
-	if(!smb_io_unistr2("unistr2", &usr->uni_mach_acct, True, ps, depth))
+
+	if(!prs_uint32("num_sids1", ps, depth, &q_u->num_sids1))
 		return False;
-	if(!prs_align(ps))
+	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
 		return False;
 
-	if(!prs_uint8s(False, "padding_9", ps, depth, usr->padding_9, sizeof(usr->padding_9)))
+	if (q_u->ptr==0)
+		return True;
+
+	if(!prs_uint32("num_sids2", ps, depth, &q_u->num_sids2))
 		return False;
 
-	return True;
-}
+	if (UNMARSHALLING(ps) && (q_u->num_sids2 != 0)) {
+		q_u->ptr_sid = (uint32 *)prs_alloc_mem(ps,sizeof(q_u->ptr_sid[0])*q_u->num_sids2);
+		if (q_u->ptr_sid == NULL)
+			return False;
 
-/*************************************************************************
- init_sam_user_info21
+		q_u->sid = (DOM_SID2 *)prs_alloc_mem(ps, sizeof(q_u->sid[0]) * q_u->num_sids2);
+		if (q_u->sid == NULL)
+			return False;
+	}
 
- unknown_3 = 0x00ff ffff
- unknown_5 = 0x0002 0000
- unknown_6 = 0x0000 04ec 
- *************************************************************************/
+	for (i = 0; i < q_u->num_sids2; i++) {
+		slprintf(tmp, sizeof(tmp) - 1, "ptr[%02d]", i);
+		if(!prs_uint32(tmp, ps, depth, &q_u->ptr_sid[i]))
+			return False;
+	}
 
-void init_sam_user_info21(SAM_USER_INFO_21 *usr, SAM_ACCOUNT *pw)
-{
-	NTTIME 		logon_time, logoff_time, kickoff_time,
-			pass_last_set_time, pass_can_change_time,
-			pass_must_change_time;
+	for (i = 0; i < q_u->num_sids2; i++) {
+		if (q_u->ptr_sid[i] != 0) {
+			slprintf(tmp, sizeof(tmp) - 1, "sid[%02d]", i);
+			if(!smb_io_dom_sid2(tmp, &q_u->sid[i], ps, depth))
+				return False;
+		}
+	}
 
-	int 		len_user_name, len_full_name, len_home_dir,
-			len_dir_drive, len_logon_script, len_profile_path,
-			len_description, len_workstations, len_unknown_str,
-			len_munged_dial;
-			
-	char*		user_name = pdb_get_username(pw);
-	char*		full_name = pdb_get_fullname(pw);
-	char*		home_dir  = pdb_get_homedir(pw);
-	char*		dir_drive = pdb_get_dirdrive(pw);
-	char*		logon_script = pdb_get_logon_script(pw);
-	char*		profile_path = pdb_get_profile_path(pw);
-	char*		description = pdb_get_acct_desc(pw);
-	char*		workstations = pdb_get_workstations(pw);
-	char*		munged_dial = pdb_get_munged_dial(pw);
+	return True;
+}
 
-	len_user_name    = user_name    != NULL ? strlen(user_name   )+1 : 0;
-	len_full_name    = full_name    != NULL ? strlen(full_name   )+1 : 0;
-	len_home_dir     = home_dir     != NULL ? strlen(home_dir    )+1 : 0;
-	len_dir_drive    = dir_drive    != NULL ? strlen(dir_drive   )+1 : 0;
-	len_logon_script = logon_script != NULL ? strlen(logon_script)+1 : 0;
-	len_profile_path = profile_path != NULL ? strlen(profile_path)+1 : 0;
-	len_description  = description  != NULL ? strlen(description )+1 : 0;
-	len_workstations = workstations != NULL ? strlen(workstations)+1 : 0;
-	len_unknown_str  = 0;
-	len_munged_dial  = munged_dial  != NULL ? strlen(munged_dial )+1 : 0;
+/*******************************************************************
+inits a SAMR_R_QUERY_USERALIASES structure.
+********************************************************************/
 
+void init_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES * r_u,
+				   uint32 num_rids, uint32 *rid,
+				   uint32 status)
+{
+	DEBUG(5, ("init_samr_r_query_useraliases\n"));
 
-	/* Create NTTIME structs */
-	unix_to_nt_time (&logon_time, 		pdb_get_logon_time(pw));
-	unix_to_nt_time (&logoff_time, 		pdb_get_logoff_time(pw));
-	unix_to_nt_time (&kickoff_time, 	pdb_get_kickoff_time(pw));
-	unix_to_nt_time (&pass_last_set_time, 	pdb_get_pass_last_set_time(pw));
-	unix_to_nt_time (&pass_can_change_time,	pdb_get_pass_can_change_time(pw));
-	unix_to_nt_time (&pass_must_change_time,pdb_get_pass_must_change_time(pw));
-	
-	/* structure assignment */
-	usr->logon_time            = logon_time;
-	usr->logoff_time           = logoff_time;
-	usr->kickoff_time          = kickoff_time;
-	usr->pass_last_set_time    = pass_last_set_time;
-	usr->pass_can_change_time  = pass_can_change_time;
-	usr->pass_must_change_time = pass_must_change_time;
+	if (status == 0x0) {
+		r_u->num_entries = num_rids;
+		r_u->ptr = 1;
+		r_u->num_entries2 = num_rids;
 
-	init_uni_hdr(&usr->hdr_user_name, len_user_name);
-	init_uni_hdr(&usr->hdr_full_name, len_full_name);
-	init_uni_hdr(&usr->hdr_home_dir, len_home_dir);
-	init_uni_hdr(&usr->hdr_dir_drive, len_dir_drive);
-	init_uni_hdr(&usr->hdr_logon_script, len_logon_script);
-	init_uni_hdr(&usr->hdr_profile_path, len_profile_path);
-	init_uni_hdr(&usr->hdr_acct_desc, len_description);
-	init_uni_hdr(&usr->hdr_workstations, len_workstations);
-	init_uni_hdr(&usr->hdr_unknown_str, len_unknown_str);
-	init_uni_hdr(&usr->hdr_munged_dial, len_munged_dial);
+		r_u->rid = rid;
+	} else {
+		r_u->num_entries = 0;
+		r_u->ptr = 0;
+		r_u->num_entries2 = 0;
+	}
 
-	memset((char *)usr->nt_pwd, '\0', sizeof(usr->nt_pwd));
-	memset((char *)usr->lm_pwd, '\0', sizeof(usr->lm_pwd));
+	r_u->status = status;
+}
 
-	usr->user_rid  = pdb_get_user_rid(pw);
-	usr->group_rid = pdb_get_group_rid(pw);
-	usr->acb_info  = pdb_get_acct_ctrl(pw);
-	usr->unknown_3 = pdb_get_unknown3(pw);
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-	usr->logon_divs = pdb_get_logon_divs(pw); 
-	usr->ptr_logon_hrs = pdb_get_hours(pw) ? 1 : 0;
-	usr->unknown_5 = pdb_get_unknown5(pw); /* 0x0002 0000 */
+BOOL samr_io_rids(char *desc, uint32 *num_rids, uint32 **rid,
+		  prs_struct *ps, int depth)
+{
+	fstring tmp;
+	uint32 i;
+	if (rid == NULL)
+		return False;
 
-	memset((char *)usr->padding1, '\0', sizeof(usr->padding1));
+	prs_debug(ps, depth, desc, "samr_io_rids");
+	depth++;
 
-	init_unistr2(&usr->uni_user_name, user_name, len_user_name);
-	init_unistr2(&usr->uni_full_name, full_name, len_full_name);
-	init_unistr2(&usr->uni_home_dir, home_dir, len_home_dir);
-	init_unistr2(&usr->uni_dir_drive, dir_drive, len_dir_drive);
-	init_unistr2(&usr->uni_logon_script, logon_script, len_logon_script);
-	init_unistr2(&usr->uni_profile_path, profile_path, len_profile_path);
-	init_unistr2(&usr->uni_acct_desc, description, len_description);
-	init_unistr2(&usr->uni_workstations, workstations, len_workstations);
-	init_unistr2(&usr->uni_unknown_str, NULL, len_unknown_str);
-	init_unistr2(&usr->uni_munged_dial, munged_dial, len_munged_dial);
+	if(!prs_align(ps))
+		return False;
 
-	usr->unknown_6 = pdb_get_unknown6(pw);
-	usr->padding4 = 0;
+	if(!prs_uint32("num_rids", ps, depth, num_rids))
+		return False;
 
-	if (pdb_get_hours(pw))
-	{
-		usr->logon_hrs.len = pdb_get_hours_len(pw);
-		memcpy(&(usr->logon_hrs.hours), pdb_get_hours(pw), MAX_HOURS_LEN);
+	if ((*num_rids) != 0) {
+		if (UNMARSHALLING(ps)) {
+			/* reading */
+			(*rid) = (uint32 *)prs_alloc_mem(ps,sizeof(uint32)*(*num_rids));
+		}
+		if ((*rid) == NULL)
+			return False;
+
+		for (i = 0; i < (*num_rids); i++) {
+			slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]", i);
+			if(!prs_uint32(tmp, ps, depth, &((*rid)[i])))
+				return False;
+		}
 	}
-	else
-		memset(&(usr->logon_hrs), 0xff, sizeof(usr->logon_hrs));
-}
 
+	return True;
+}
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-static BOOL sam_io_user_info21(char *desc, SAM_USER_INFO_21 *usr, prs_struct *ps, int depth)
+BOOL samr_io_r_query_useraliases(char *desc, SAMR_R_QUERY_USERALIASES * r_u,
+				 prs_struct *ps, int depth)
 {
-	if (usr == NULL)
+	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "sam_io_user_info21");
+	prs_debug(ps, depth, desc, "samr_io_r_query_useraliases");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
-	
-	if(!smb_io_time("logon_time           ", &usr->logon_time, ps, depth))
-		return False;
-	if(!smb_io_time("logoff_time          ", &usr->logoff_time, ps, depth)) 
-		return False;
-	if(!smb_io_time("kickoff_time         ", &usr->kickoff_time, ps, depth)) 
-		return False;
-	if(!smb_io_time("pass_last_set_time   ", &usr->pass_last_set_time, ps, depth)) 
-		return False;
-	if(!smb_io_time("pass_can_change_time ", &usr->pass_can_change_time, ps, depth)) 
-		return False;
-	if(!smb_io_time("pass_must_change_time", &usr->pass_must_change_time, ps, depth)) 
-		return False;
 
-	if(!smb_io_unihdr("hdr_user_name   ", &usr->hdr_user_name, ps, depth)) /* username unicode string header */
-		return False;
-	if(!smb_io_unihdr("hdr_full_name   ", &usr->hdr_full_name, ps, depth)) /* user's full name unicode string header */
-		return False;
-	if(!smb_io_unihdr("hdr_home_dir    ", &usr->hdr_home_dir, ps, depth)) /* home directory unicode string header */
-		return False;
-	if(!smb_io_unihdr("hdr_dir_drive   ", &usr->hdr_dir_drive, ps, depth)) /* home directory drive */
-		return False;
-	if(!smb_io_unihdr("hdr_logon_script", &usr->hdr_logon_script, ps, depth)) /* logon script unicode string header */
-		return False;
-	if(!smb_io_unihdr("hdr_profile_path", &usr->hdr_profile_path, ps, depth)) /* profile path unicode string header */
-		return False;
-	if(!smb_io_unihdr("hdr_acct_desc   ", &usr->hdr_acct_desc, ps, depth)) /* account description */
+	if(!prs_uint32("num_entries", ps, depth, &r_u->num_entries))
 		return False;
-	if(!smb_io_unihdr("hdr_workstations", &usr->hdr_workstations, ps, depth)) /* workstations user can log on from */
+	if(!prs_uint32("ptr        ", ps, depth, &r_u->ptr))
 		return False;
-	if(!smb_io_unihdr("hdr_unknown_str ", &usr->hdr_unknown_str, ps, depth)) /* unknown string */
+
+	if (r_u->ptr != 0) {
+		if(!samr_io_rids("rids", &r_u->num_entries2, &r_u->rid, ps, depth))
+			return False;
+	}
+
+	if(!prs_align(ps))
 		return False;
-	if(!smb_io_unihdr("hdr_munged_dial ", &usr->hdr_munged_dial, ps, depth)) /* workstations user can log on from */
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
-	if(!prs_uint8s (False, "lm_pwd        ", ps, depth, usr->lm_pwd, sizeof(usr->lm_pwd)))
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_Q_OPEN_ALIAS structure.
+********************************************************************/
+
+void init_samr_q_open_alias(SAMR_Q_OPEN_ALIAS * q_u, POLICY_HND *pol,
+			    uint32 unknown_0, uint32 rid)
+{
+	DEBUG(5, ("init_samr_q_open_alias\n"));
+
+	q_u->dom_pol = *pol;
+
+	/* example values: 0x0000 0008 */
+	q_u->unknown_0 = unknown_0;
+
+	q_u->rid_alias = rid;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_open_alias(char *desc, SAMR_Q_OPEN_ALIAS * q_u,
+			  prs_struct *ps, int depth)
+{
+	if (q_u == NULL)
 		return False;
-	if(!prs_uint8s (False, "nt_pwd        ", ps, depth, usr->nt_pwd, sizeof(usr->nt_pwd)))
+
+	prs_debug(ps, depth, desc, "samr_io_q_open_alias");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("user_rid      ", ps, depth, &usr->user_rid))       /* User ID */
+	if(!smb_io_pol_hnd("domain_pol", &q_u->dom_pol, ps, depth))
 		return False;
-	if(!prs_uint32("group_rid     ", ps, depth, &usr->group_rid))      /* Group ID */
+
+	if(!prs_uint32("unknown_0", ps, depth, &q_u->unknown_0))
 		return False;
-	if(!prs_uint32("acb_info      ", ps, depth, &usr->acb_info))      /* Group ID */
+	if(!prs_uint32("rid_alias", ps, depth, &q_u->rid_alias))
 		return False;
 
-	if(!prs_uint32("unknown_3     ", ps, depth, &usr->unknown_3))
-		return False;
-	if(!prs_uint16("logon_divs    ", ps, depth, &usr->logon_divs))     /* logon divisions per week */
+	return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_open_alias(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(!prs_uint32("ptr_logon_hrs ", ps, depth, &usr->ptr_logon_hrs))
-		return False;
-	if(!prs_uint32("unknown_5     ", ps, depth, &usr->unknown_5))
+
+	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
 		return False;
 
-	if(!prs_uint8s (False, "padding1      ", ps, depth, usr->padding1, sizeof(usr->padding1)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
-	/* here begins pointed-to data */
+	return True;
+}
 
-	if(!smb_io_unistr2("uni_user_name   ", &usr->uni_user_name, usr->hdr_user_name.buffer, ps, depth)) /* username unicode string */
-		return False;
-	if(!prs_align_needed(ps, usr->hdr_full_name.buffer))
-		return False;
-	if(!smb_io_unistr2("uni_full_name   ", &usr->uni_full_name, usr->hdr_full_name.buffer, ps, depth)) /* user's full name unicode string */
-		return False;
-	if(!prs_align_needed(ps, usr->hdr_home_dir.buffer))
-		return False;
-	if(!smb_io_unistr2("uni_home_dir    ", &usr->uni_home_dir, usr->hdr_home_dir.buffer, ps, depth)) /* home directory unicode string */
-		return False;
-	if(!prs_align_needed(ps, usr->hdr_dir_drive.buffer))
-		return False;
-	if(!smb_io_unistr2("uni_dir_drive   ", &usr->uni_dir_drive, usr->hdr_dir_drive.buffer, ps, depth)) /* home directory drive unicode string */
-		return False;
-	if(!prs_align_needed(ps, usr->hdr_logon_script.buffer))
-		return False;
-	if(!smb_io_unistr2("uni_logon_script", &usr->uni_logon_script, usr->hdr_logon_script.buffer, ps, depth)) /* logon script unicode string */
-		return False;
-	if(!prs_align_needed(ps, usr->hdr_profile_path.buffer))
-		return False;
-	if(!smb_io_unistr2("uni_profile_path", &usr->uni_profile_path, usr->hdr_profile_path.buffer, ps, depth)) /* profile path unicode string */
-		return False;
-	if(!prs_align_needed(ps, usr->hdr_acct_desc.buffer))
-		return False;
-	if(!smb_io_unistr2("uni_acct_desc   ", &usr->uni_acct_desc, usr->hdr_acct_desc.buffer, ps, depth)) /* user description unicode string */
+/*******************************************************************
+inits a SAMR_Q_LOOKUP_RIDS structure.
+********************************************************************/
+
+void init_samr_q_lookup_rids(TALLOC_CTX *ctx, SAMR_Q_LOOKUP_RIDS * q_u,
+			     POLICY_HND *pol, uint32 flags,
+			     uint32 num_rids, uint32 *rid)
+{
+	DEBUG(5, ("init_samr_q_lookup_rids\n"));
+
+	q_u->pol = *pol;
+
+	q_u->num_rids1 = num_rids;
+	q_u->flags = flags;
+	q_u->ptr = 0;
+	q_u->num_rids2 = num_rids;
+	q_u->rid = (uint32 *)talloc_zero(ctx, num_rids * sizeof(q_u->rid[0]));
+	if (q_u->rid == NULL) {
+		q_u->num_rids1 = 0;
+		q_u->num_rids2 = 0;
+	}
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_lookup_rids(char *desc, SAMR_Q_LOOKUP_RIDS * q_u,
+			   prs_struct *ps, int depth)
+{
+	uint32 i;
+	fstring tmp;
+
+	if (q_u == NULL)
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_workstations.buffer))
+
+	prs_debug(ps, depth, desc, "samr_io_q_lookup_rids");
+	depth++;
+
+	if (UNMARSHALLING(ps))
+		ZERO_STRUCTP(q_u);
+
+	if(!prs_align(ps))
 		return False;
-	if(!smb_io_unistr2("uni_workstations", &usr->uni_workstations, usr->hdr_workstations.buffer, ps, depth)) /* worksations user can log on from */
+
+	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_unknown_str.buffer))
+
+	if(!prs_uint32("num_rids1", ps, depth, &q_u->num_rids1))
 		return False;
-	if(!smb_io_unistr2("uni_user_comment", &usr->uni_unknown_str, usr->hdr_unknown_str.buffer, ps, depth)) /* unknown string */
+	if(!prs_uint32("flags    ", ps, depth, &q_u->flags))
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_munged_dial.buffer))
+	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
 		return False;
-	if(!smb_io_unistr2("uni_munged_dial ", &usr->uni_munged_dial, usr->hdr_munged_dial.buffer, ps, depth)) /* worksations user can log on from */
+	if(!prs_uint32("num_rids2", ps, depth, &q_u->num_rids2))
 		return False;
 
-	if (usr->ptr_logon_hrs) {
-	
-		if(!prs_align(ps))
-			return False;
-		if(!prs_uint32("unknown_6     ", ps, depth, &usr->unknown_6))
-			return False;
-		if(!prs_uint32("padding4      ", ps, depth, &usr->padding4))
+	if (UNMARSHALLING(ps) && (q_u->num_rids2 != 0)) {
+		q_u->rid = (uint32 *)prs_alloc_mem(ps, sizeof(q_u->rid[0])*q_u->num_rids2);
+		if (q_u->rid == NULL)
 			return False;
+	}
 
-		if(!sam_io_logon_hrs("logon_hrs", &usr->logon_hrs, ps, depth))
+	for (i = 0; i < q_u->num_rids2; i++) {
+		slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
+		if(!prs_uint32(tmp, ps, depth, &q_u->rid[i]))
 			return False;
 	}
 
@@ -3187,107 +3732,118 @@ static BOOL sam_io_user_info21(char *desc, SAM_USER_INFO_21 *usr, prs_struct *ps
 }
 
 /*******************************************************************
- Inits a SAMR_R_QUERY_USERINFO structure.
+inits a SAMR_R_LOOKUP_RIDS structure.
 ********************************************************************/
 
-void init_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO *r_u,
-				uint16 switch_value, void *info, uint32 status)
+void init_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS * r_u,
+			     uint32 num_names, UNIHDR * hdr_name,
+			     UNISTR2 *uni_name, uint32 *type)
 {
-	DEBUG(5,("init_samr_r_query_userinfo\n"));
-
-	r_u->ptr = 0;
-	r_u->switch_value = 0;
+	DEBUG(5, ("init_samr_r_lookup_rids\n"));
 
-	if (status == 0) {
-		r_u->switch_value = switch_value;
+	r_u->hdr_name = NULL;
+	r_u->uni_name = NULL;
+	r_u->type = NULL;
 
-		switch (switch_value) {
-		case 0x10:
-			r_u->ptr = 1;
-			r_u->info.id10 = (SAM_USER_INFO_10*)info;
-			break;
+	if (num_names != 0) {
+		r_u->num_names1 = num_names;
+		r_u->ptr_names = 1;
+		r_u->num_names2 = num_names;
 
-		case 0x11:
-			r_u->ptr = 1;
-			r_u->info.id11 = (SAM_USER_INFO_11*)info;
-			break;
+		r_u->num_types1 = num_names;
+		r_u->ptr_types = 1;
+		r_u->num_types2 = num_names;
 
-		case 21:
-			r_u->ptr = 1;
-			r_u->info.id21 = (SAM_USER_INFO_21*)info;
-			break;
+		r_u->hdr_name = hdr_name;
+		r_u->uni_name = uni_name;
+		r_u->type = type;
+	} else {
+		r_u->num_names1 = num_names;
+		r_u->ptr_names = 0;
+		r_u->num_names2 = num_names;
 
-		default:
-			DEBUG(4,("init_samr_r_query_aliasinfo: unsupported switch level\n"));
-			break;
-		}
+		r_u->num_types1 = num_names;
+		r_u->ptr_types = 0;
+		r_u->num_types2 = num_names;
 	}
-
-	r_u->status = status;         /* return status */
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_query_userinfo(char *desc, SAMR_R_QUERY_USERINFO *r_u, 
-			      prs_struct *ps, int depth)
+BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS * r_u,
+			   prs_struct *ps, int depth)
 {
+	uint32 i;
+	fstring tmp;
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_query_userinfo");
+	prs_debug(ps, depth, desc, "samr_io_r_lookup_rids");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr         ", ps, depth, &r_u->ptr))
-		return False;
-	if(!prs_uint16("switch_value", ps, depth, &r_u->switch_value))
+	if(!prs_uint32("num_names1", ps, depth, &r_u->num_names1))
 		return False;
-	if(!prs_align(ps))
+	if(!prs_uint32("ptr_names ", ps, depth, &r_u->ptr_names))
 		return False;
 
-	if (r_u->ptr != 0 && r_u->switch_value != 0) {
-		switch (r_u->switch_value) {
-		case 0x10:
-			if (r_u->info.id10 != NULL) {
-				if(!sam_io_user_info10("", r_u->info.id10, ps, depth))
-					return False;
-			} else {
-				DEBUG(2,("samr_io_r_query_userinfo: info pointer not initialised\n"));
+	if (r_u->ptr_names != 0) {
+
+		if(!prs_uint32("num_names2", ps, depth, &r_u->num_names2))
+			return False;
+
+
+		if (UNMARSHALLING(ps) && (r_u->num_names2 != 0)) {
+			r_u->hdr_name = (UNIHDR *) prs_alloc_mem(ps, r_u->num_names2 * sizeof(r_u->hdr_name[0]));
+			if (r_u->hdr_name == NULL)
 				return False;
-			}
-			break;
-/*
-		case 0x11:
-			if (r_u->info.id11 != NULL) {
-				if(!sam_io_user_info11("", r_u->info.id11, ps, depth))
-					return False;
-			} else {
-				DEBUG(2,("samr_io_r_query_userinfo: info pointer not initialised\n"));
+
+			r_u->uni_name = (UNISTR2 *)prs_alloc_mem(ps, r_u->num_names2 * sizeof(r_u->uni_name[0]));
+			if (r_u->uni_name == NULL)
 				return False;
-			}
-			break;
-*/
-		case 21:
-			if (r_u->info.id21 != NULL) {
-				if(!sam_io_user_info21("", r_u->info.id21, ps, depth))
-					return False;
-			} else {
-				DEBUG(2,("samr_io_r_query_userinfo: info pointer not initialised\n"));
+		}
+		
+		for (i = 0; i < r_u->num_names2; i++) {
+			slprintf(tmp, sizeof(tmp) - 1, "hdr[%02d]  ", i);
+			if(!smb_io_unihdr("", &r_u->hdr_name[i], ps, depth))
+				return False;
+		}
+		for (i = 0; i < r_u->num_names2; i++) {
+			slprintf(tmp, sizeof(tmp) - 1, "str[%02d]  ", i);
+			if(!smb_io_unistr2("", &r_u->uni_name[i], r_u->hdr_name[i].buffer, ps, depth))
 				return False;
-			}
-			break;
-		default:
-			DEBUG(2,("samr_io_r_query_userinfo: unknown switch level\n"));
-			break;
 		}
-	}
 
+	}
+	
 	if(!prs_align(ps))
 		return False;
+	if(!prs_uint32("num_types1", ps, depth, &r_u->num_types1))
+		return False;
+	if(!prs_uint32("ptr_types ", ps, depth, &r_u->ptr_types))
+		return False;
+
+	if (r_u->ptr_types != 0) {
+
+		if(!prs_uint32("num_types2", ps, depth, &r_u->num_types2))
+			return False;
+
+		if (UNMARSHALLING(ps) && (r_u->num_types2 != 0)) {
+			r_u->type = (uint32 *)prs_alloc_mem(ps, r_u->num_types2 * sizeof(r_u->type[0]));
+			if (r_u->type == NULL)
+				return False;
+		}
+
+		for (i = 0; i < r_u->num_types2; i++) {
+			slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
+			if(!prs_uint32(tmp, ps, depth, &r_u->type[i]))
+				return False;
+		}
+	}
 
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
@@ -3296,51 +3852,49 @@ BOOL samr_io_r_query_userinfo(char *desc, SAMR_R_QUERY_USERINFO *r_u,
 }
 
 /*******************************************************************
- Reads or writes a structure.
+inits a SAMR_Q_OPEN_ALIAS structure.
 ********************************************************************/
 
-BOOL samr_io_q_create_user(char *desc, SAMR_Q_CREATE_USER *q_u, prs_struct *ps, int depth)
+void init_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS * q_u, POLICY_HND *hnd)
 {
-	if (q_u == NULL)
-		return False;
+	DEBUG(5, ("init_samr_q_delete_alias\n"));
 
-	prs_debug(ps, depth, desc, "samr_io_q_create_user");
-	depth++;
+	q_u->alias_pol = *hnd;
+}
 
-	if(!prs_align(ps))
-		return False;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
+BOOL samr_io_q_delete_alias(char *desc, SAMR_Q_DELETE_DOM_ALIAS * q_u,
+			    prs_struct *ps, int depth)
+{
+	if (q_u == NULL)
 		return False;
 
-	if(!smb_io_unihdr ("", &q_u->hdr_mach_acct, ps, depth))
-		return False;
-	if(!smb_io_unistr2("", &q_u->uni_mach_acct, q_u->hdr_mach_acct.buffer, ps, depth))
-		return False;
+	prs_debug(ps, depth, desc, "samr_io_q_delete_alias");
+	depth++;
 
 	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))
+	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_create_user(char *desc, SAMR_R_CREATE_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_delete_alias(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_unknown_32");
+	prs_debug(ps, depth, desc, "samr_io_r_delete_alias");
 	depth++;
 
 	if(!prs_align(ps))
@@ -3348,12 +3902,6 @@ BOOL samr_io_r_create_user(char *desc, SAMR_R_CREATE_USER *r_u, prs_struct *ps,
 
 	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
 		return False;
-
-	if(!prs_uint32("unknown_0", ps, depth, &r_u->unknown_0))
-		return False;
-	if(!prs_uint32("user_rid", ps, depth, &r_u->user_rid))
-		return False;
-
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -3361,70 +3909,77 @@ BOOL samr_io_r_create_user(char *desc, SAMR_R_CREATE_USER *r_u, prs_struct *ps,
 }
 
 /*******************************************************************
- Inits a SAMR_Q_CONNECT structure.
+inits a SAMR_Q_CREATE_DOM_ALIAS structure.
 ********************************************************************/
 
-void init_samr_q_connect(SAMR_Q_CONNECT *q_u, char *srv_name, 
-			 uint32 access_mask)
+void init_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS * q_u,
+				  POLICY_HND *hnd, char *acct_desc)
 {
-	int len_srv_name = strlen(srv_name);
+	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
 
-	DEBUG(5,("init_q_connect\n"));
+	DEBUG(5, ("init_samr_q_create_dom_alias\n"));
 
-	/* make PDC server name \\server */
-	q_u->ptr_srv_name = len_srv_name > 0; 
-	init_unistr2(&q_u->uni_srv_name, srv_name, len_srv_name + 1);  
+	q_u->dom_pol = *hnd;
 
-	q_u->access_mask = access_mask;
+	init_uni_hdr(&q_u->hdr_acct_desc, acct_len);
+	init_unistr2(&q_u->uni_acct_desc, acct_desc, acct_len);
+
+	q_u->access_mask = 0x001f000f;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_connect(char *desc,  SAMR_Q_CONNECT *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_create_dom_alias(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_connect");
+	prs_debug(ps, depth, desc, "samr_io_q_create_dom_alias");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr_srv_name", ps, depth, &q_u->ptr_srv_name))
+	if(!smb_io_pol_hnd("dom_pol", &q_u->dom_pol, ps, depth))
 		return False;
-	if(!smb_io_unistr2("", &q_u->uni_srv_name, q_u->ptr_srv_name, ps, depth))
+
+	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))
+	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_connect(char *desc,  SAMR_R_CONNECT *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_create_dom_alias(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_connect");
+	prs_debug(ps, depth, desc, "samr_io_r_create_dom_alias");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
+	if(!smb_io_pol_hnd("alias_pol", &r_u->alias_pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
+
+	if(!prs_uint32("rid", ps, depth, &r_u->rid))
 		return False;
 
 	if(!prs_uint32("status", ps, depth, &r_u->status))
@@ -3434,67 +3989,58 @@ BOOL samr_io_r_connect(char *desc,  SAMR_R_CONNECT *r_u, prs_struct *ps, int dep
 }
 
 /*******************************************************************
- Inits a SAMR_Q_CONNECT_ANON structure.
+inits a SAMR_Q_ADD_ALIASMEM structure.
 ********************************************************************/
 
-void init_samr_q_connect_anon(SAMR_Q_CONNECT_ANON *q_u)
+void init_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM * q_u, POLICY_HND *hnd,
+			      DOM_SID *sid)
 {
-	DEBUG(5,("init_q_connect_anon\n"));
+	DEBUG(5, ("init_samr_q_add_aliasmem\n"));
 
-	q_u->ptr       = 1;
-	q_u->unknown_0 = 0x5c; /* server name (?!!) */
-	q_u->unknown_1 = 0x01;
-	q_u->unknown_2 = 0x20;
+	q_u->alias_pol = *hnd;
+	init_dom_sid2(&q_u->sid, sid);
 }
 
-
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_connect_anon(char *desc,  SAMR_Q_CONNECT_ANON *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_add_aliasmem(char *desc, SAMR_Q_ADD_ALIASMEM * q_u,
+			    prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_connect_anon");
+	prs_debug(ps, depth, desc, "samr_io_q_add_aliasmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
+	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
 		return False;
-	if(!prs_uint16("unknown_0", ps, depth, &q_u->unknown_0))
-		return False;
-	if(!prs_uint16("unknown_1", ps, depth, &q_u->unknown_1))
-		return False;
-	if(!prs_uint32("unknown_2", ps, depth, &q_u->unknown_2))
+	if(!smb_io_dom_sid2("sid      ", &q_u->sid, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_connect_anon(char *desc,  SAMR_R_CONNECT_ANON *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_add_aliasmem(char *desc, SAMR_R_ADD_ALIASMEM * r_u,
+			    prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_connect_anon");
+	prs_debug(ps, depth, desc, "samr_io_r_add_aliasmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -3502,65 +4048,58 @@ BOOL samr_io_r_connect_anon(char *desc,  SAMR_R_CONNECT_ANON *r_u, prs_struct *p
 }
 
 /*******************************************************************
- Inits a SAMR_Q_OPEN_ALIAS structure.
+inits a SAMR_Q_DEL_ALIASMEM structure.
 ********************************************************************/
-void init_samr_q_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
-				uint32 unknown_0, uint32 rid)
-{
-	DEBUG(5,("init_q_open_alias\n"));
 
-	/* example values: 0x0000 0008 */
-	q_u->unknown_0 = unknown_0; 
+void init_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM * q_u, POLICY_HND *hnd,
+			      DOM_SID *sid)
+{
+	DEBUG(5, ("init_samr_q_del_aliasmem\n"));
 
-	q_u->rid_alias = rid; 
+	q_u->alias_pol = *hnd;
+	init_dom_sid2(&q_u->sid, sid);
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_open_alias(char *desc, SAMR_Q_OPEN_ALIAS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_del_aliasmem(char *desc, SAMR_Q_DEL_ALIASMEM * q_u,
+			    prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_open_alias");
+	prs_debug(ps, depth, desc, "samr_io_q_del_aliasmem");
 	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("unknown_0", ps, depth, &q_u->unknown_0))
+	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
 		return False;
-	if(!prs_uint32("rid_alias", ps, depth, &q_u->rid_alias))
+	if(!smb_io_dom_sid2("sid      ", &q_u->sid, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_del_aliasmem(char *desc, SAMR_R_DEL_ALIASMEM * r_u,
+			    prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_open_alias");
+	prs_debug(ps, depth, desc, "samr_io_r_del_aliasmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
-		return False;
-	if(!prs_align(ps))
-		return False;
-
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
@@ -3568,587 +4107,1107 @@ BOOL samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, i
 }
 
 /*******************************************************************
- Inits a SAMR_Q_UNKNOWN_12 structure.
+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.
 ********************************************************************/
 
-void init_samr_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u,
-		POLICY_HND *pol, uint32 rid,
-		uint32 num_gids, uint32 *gid)
+BOOL samr_io_q_delete_dom_alias(char *desc, SAMR_Q_DELETE_DOM_ALIAS * q_u,
+				prs_struct *ps, int depth)
 {
-	int i;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("init_samr_q_lookup_rids\n"));
+	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_alias");
+	depth++;
 
-	memcpy(&q_u->pol, pol, sizeof(*pol));
+	if(!prs_align(ps))
+		return False;
 
-	q_u->num_gids1 = num_gids;
-	q_u->rid       = rid;
-	q_u->ptr       = 0;
-	q_u->num_gids2 = num_gids;
+	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
+		return False;
 
-	for (i = 0; i < num_gids; i++) {
-		q_u->gid[i] = gid[i];
-	}
+	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_Q_UNKNOWN_21 structure.
+inits a SAMR_R_DELETE_DOM_ALIAS structure.
 ********************************************************************/
 
-void init_samr_q_unknown_21(SAMR_Q_UNKNOWN_21 *q_c,
-				POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
+void init_samr_r_delete_dom_alias(SAMR_R_DELETE_DOM_ALIAS * r_u,
+				  uint32 status)
 {
-	DEBUG(5,("init_samr_q_unknown_21\n"));
+	DEBUG(5, ("init_samr_r_delete_dom_alias\n"));
 
-	memcpy(&q_c->group_pol, hnd, sizeof(q_c->group_pol));
-	q_c->unknown_1 = unk_1;
-	q_c->unknown_2 = unk_2;
+	r_u->status = status;
 }
 
-
 /*******************************************************************
- Inits a SAMR_Q_UNKNOWN_13 structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_unknown_13(SAMR_Q_UNKNOWN_13 *q_c,
-				POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
+BOOL samr_io_r_delete_dom_alias(char *desc, SAMR_R_DELETE_DOM_ALIAS * r_u,
+				prs_struct *ps, int depth)
 {
-	DEBUG(5,("init_samr_q_unknown_13\n"));
+	if (r_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_alias");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
 
-	memcpy(&q_c->alias_pol, hnd, sizeof(q_c->alias_pol));
-	q_c->unknown_1 = unk_1;
-	q_c->unknown_2 = unk_2;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_Q_UNKNOWN_38 structure.
+inits a SAMR_Q_QUERY_ALIASMEM structure.
 ********************************************************************/
-void init_samr_q_unknown_38(SAMR_Q_UNKNOWN_38 *q_u, char *srv_name)
-{
-	int len_srv_name = strlen(srv_name)+1;
-
-	DEBUG(5,("init_q_unknown_38\n"));
 
-	q_u->ptr = 1;
-	init_uni_hdr(&q_u->hdr_srv_name, len_srv_name);
-	init_unistr2(&q_u->uni_srv_name, srv_name, len_srv_name);  
+void init_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM * q_c,
+				POLICY_HND *hnd)
+{
+	DEBUG(5, ("init_samr_q_query_aliasmem\n"));
 
+	q_c->alias_pol = *hnd;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_unknown_38(char *desc,  SAMR_Q_UNKNOWN_38 *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_aliasmem(char *desc, SAMR_Q_QUERY_ALIASMEM * q_u,
+			      prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_unknown_38");
+	prs_debug(ps, depth, desc, "samr_io_q_query_aliasmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr", ps, depth, &q_u->ptr))
+	if(!smb_io_pol_hnd("alias_pol", &q_u->alias_pol, ps, depth))
 		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;
 }
 
 /*******************************************************************
- Inits a SAMR_R_UNKNOWN_38 structure.
+inits a SAMR_R_QUERY_ALIASMEM structure.
 ********************************************************************/
 
-void init_samr_r_unknown_38(SAMR_R_UNKNOWN_38 *r_u)
+void init_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM * r_u,
+				uint32 num_sids, DOM_SID2 * sid,
+				uint32 status)
 {
-	DEBUG(5,("init_r_unknown_38\n"));
+	DEBUG(5, ("init_samr_r_query_aliasmem\n"));
+
+	if (status == 0) {
+		r_u->num_sids = num_sids;
+		r_u->ptr = (num_sids != 0) ? 1 : 0;
+		r_u->num_sids1 = num_sids;
+
+		r_u->sid = sid;
+	} else {
+		r_u->ptr = 0;
+		r_u->num_sids = 0;
+	}
 
-	r_u->unk_0 = 0;
-	r_u->unk_1 = 0;
-	r_u->unk_2 = 0;
-	r_u->unk_3 = 0;
+	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_unknown_38(char *desc,  SAMR_R_UNKNOWN_38 *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_aliasmem(char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
+			      prs_struct *ps, int depth)
 {
+	uint32 i;
+	uint32 ptr_sid[MAX_LOOKUP_SIDS];
+
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_unknown_38");
+	prs_debug(ps, depth, desc, "samr_io_r_query_aliasmem");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint16("unk_0", ps, depth, &r_u->unk_0))
+	if(!prs_uint32("num_sids ", ps, depth, &r_u->num_sids))
 		return False;
+	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
+		return False;
+
+	if (r_u->ptr != 0) {
+		SMB_ASSERT_ARRAY(ptr_sid, r_u->num_sids);
+
+		if (r_u->num_sids != 0) {
+			if(!prs_uint32("num_sids1", ps, depth, &r_u->num_sids1))
+				return False;
+
+			for (i = 0; i < r_u->num_sids1; i++) {
+				ptr_sid[i] = 1;
+				if(!prs_uint32("", ps, depth, &ptr_sid[i]))
+				  return False;
+			}
+
+			for (i = 0; i < r_u->num_sids1; i++) {
+				if (ptr_sid[i] != 0) {
+					if(!smb_io_dom_sid2("", &r_u->sid[i], ps, depth))
+						return False;
+				}
+			}
+		}
+	}
+
 	if(!prs_align(ps))
 		return False;
-	if(!prs_uint16("unk_1", ps, depth, &r_u->unk_1))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_Q_LOOKUP_NAMES structure.
+********************************************************************/
+
+void init_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES * q_u,
+			      POLICY_HND *pol, uint32 flags,
+			      uint32 num_names, char **name)
+{
+	uint32 i;
+
+	DEBUG(5, ("init_samr_q_lookup_names\n"));
+
+	q_u->pol = *pol;
+
+	q_u->num_names1 = num_names;
+	q_u->flags = flags;
+	q_u->ptr = 0;
+	q_u->num_names2 = num_names;
+
+	for (i = 0; i < num_names; i++) {
+		int len_name = name[i] != NULL ? strlen(name[i]) : 0;
+		init_uni_hdr(&q_u->hdr_name[i], len_name);	/* unicode header for user_name */
+		init_unistr2(&q_u->uni_name[i], name[i], len_name);	/* unicode string for machine account */
+	}
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_lookup_names(char *desc, SAMR_Q_LOOKUP_NAMES * q_u,
+			    prs_struct *ps, int depth)
+{
+	uint32 i;
+
+	if (q_u == NULL)
 		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_lookup_names");
+	depth++;
+
+	if (UNMARSHALLING(ps))
+		ZERO_STRUCTP(q_u);
+
 	if(!prs_align(ps))
 		return False;
-	if(!prs_uint16("unk_2", ps, depth, &r_u->unk_2))
+
+	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
 		return False;
-	if(!prs_align(ps))
+
+	if(!prs_uint32("num_names1", ps, depth, &q_u->num_names1))
 		return False;
-	if(!prs_uint16("unk_3", ps, depth, &r_u->unk_3))
+	if(!prs_uint32("flags     ", ps, depth, &q_u->flags))
 		return False;
-	if(!prs_align(ps))
+	if(!prs_uint32("ptr       ", ps, depth, &q_u->ptr))
+		return False;
+	if(!prs_uint32("num_names2", ps, depth, &q_u->num_names2))
 		return False;
 
+	SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2);
+
+	for (i = 0; i < q_u->num_names2; i++) {
+		if(!smb_io_unihdr("", &q_u->hdr_name[i], ps, depth))
+			return False;
+	}
+
+	for (i = 0; i < q_u->num_names2; i++) {
+		if(!smb_io_unistr2("", &q_u->uni_name[i], q_u->hdr_name[i].buffer, ps, depth))
+			return False;
+	}
+
 	return True;
 }
 
 /*******************************************************************
-make a SAMR_ENC_PASSWD structure.
+inits a SAMR_R_LOOKUP_NAMES structure.
 ********************************************************************/
 
-void init_enc_passwd(SAMR_ENC_PASSWD *pwd, char pass[512])
+void init_samr_r_lookup_names(TALLOC_CTX *ctx, SAMR_R_LOOKUP_NAMES * r_u,
+			      uint32 num_rids,
+			      uint32 *rid, uint32 *type,
+			      uint32 status)
 {
-	pwd->ptr = 1;
-	memcpy(pwd->pass, pass, sizeof(pwd->pass)); 
+	DEBUG(5, ("init_samr_r_lookup_names\n"));
+
+	if ((status == 0) && (num_rids != 0))	{
+		uint32 i;
+
+		r_u->num_types1 = num_rids;
+		r_u->ptr_types = 1;
+		r_u->num_types2 = num_rids;
+
+		r_u->num_rids1 = num_rids;
+		r_u->ptr_rids = 1;
+		r_u->num_rids2 = num_rids;
+
+		r_u->rids = (uint32 *)talloc_zero(ctx, sizeof(uint32)*num_rids);
+		r_u->types = (uint32 *)talloc_zero(ctx, sizeof(uint32)*num_rids);
+
+		if (!r_u->rids || !r_u->types)
+			goto empty;
+
+		for (i = 0; i < num_rids; i++) {
+			r_u->rids[i] = rid[i];
+			r_u->types[i] = type[i];
+		}
+	} else {
+
+  empty:
+		r_u->num_types1 = 0;
+		r_u->ptr_types = 0;
+		r_u->num_types2 = 0;
+
+		r_u->num_rids1 = 0;
+		r_u->ptr_rids = 0;
+		r_u->num_rids2 = 0;
+
+		r_u->rids = NULL;
+		r_u->types = NULL;
+	}
+
+	r_u->status = status;
 }
 
 /*******************************************************************
- Reads or writes a SAMR_ENC_PASSWD structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD *pwd, prs_struct *ps, int depth)
+BOOL samr_io_r_lookup_names(char *desc, SAMR_R_LOOKUP_NAMES * r_u,
+			    prs_struct *ps, int depth)
 {
-	if (pwd == NULL)
+	uint32 i;
+	fstring tmp;
+
+	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_enc_passwd");
+	prs_debug(ps, depth, desc, "samr_io_r_lookup_names");
 	depth++;
 
+	if (UNMARSHALLING(ps))
+		ZERO_STRUCTP(r_u);
+
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr", ps, depth, &pwd->ptr))
+	if(!prs_uint32("num_rids1", ps, depth, &r_u->num_rids1))
+		return False;
+	if(!prs_uint32("ptr_rids ", ps, depth, &r_u->ptr_rids))
+		return False;
+
+	if (r_u->ptr_rids != 0)	{
+		if(!prs_uint32("num_rids2", ps, depth, &r_u->num_rids2))
+			return False;
+
+		if (r_u->num_rids2 != r_u->num_rids1) {
+			/* RPC fault */
+			return False;
+		}
+
+		if (UNMARSHALLING(ps))
+			r_u->rids = (uint32 *)prs_alloc_mem(ps, sizeof(uint32)*r_u->num_rids2);
+
+		if (!r_u->rids) {
+			DEBUG(0, ("NULL rids in samr_io_r_lookup_names\n"));
+			return False;
+		}
+
+		for (i = 0; i < r_u->num_rids2; i++) {
+			slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
+			if(!prs_uint32(tmp, ps, depth, &r_u->rids[i]))
+				return False;
+		}
+	}
+
+	if(!prs_uint32("num_types1", ps, depth, &r_u->num_types1))
 		return False;
-	if(!prs_uint8s(False, "pwd", ps, depth, pwd->pass, sizeof(pwd->pass)))
+	if(!prs_uint32("ptr_types ", ps, depth, &r_u->ptr_types))
+		return False;
+
+	if (r_u->ptr_types != 0) {
+		if(!prs_uint32("num_types2", ps, depth, &r_u->num_types2))
+			return False;
+
+		if (r_u->num_types2 != r_u->num_types1) {
+			/* RPC fault */
+			return False;
+		}
+
+		if (UNMARSHALLING(ps))
+			r_u->types = (uint32 *)prs_alloc_mem(ps, sizeof(uint32)*r_u->num_types2);
+
+		if (!r_u->types) {
+			DEBUG(0, ("NULL types in samr_io_r_lookup_names\n"));
+			return False;
+		}
+
+		for (i = 0; i < r_u->num_types2; i++) {
+			slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
+			if(!prs_uint32(tmp, ps, depth, &r_u->types[i]))
+				return False;
+		}
+	}
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_ENC_HASH structure.
+inits a SAMR_Q_DELETE_DOM_USER structure.
 ********************************************************************/
 
-void init_enc_hash(SAMR_ENC_HASH *hsh, uchar hash[16])
+void init_samr_q_delete_dom_user(SAMR_Q_DELETE_DOM_USER * q_c,
+				 POLICY_HND *hnd)
 {
-	hsh->ptr = 1;
-	memcpy(hsh->hash, hash, sizeof(hsh->hash));
+	DEBUG(5, ("init_samr_q_delete_dom_user\n"));
+
+	q_c->user_pol = *hnd;
 }
 
 /*******************************************************************
- Reads or writes a SAMR_ENC_HASH structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_enc_hash(char *desc, SAMR_ENC_HASH *hsh, prs_struct *ps, int depth)
+BOOL samr_io_q_delete_dom_user(char *desc, SAMR_Q_DELETE_DOM_USER * q_u,
+			       prs_struct *ps, int depth)
 {
-	if (hsh == NULL)
+	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_enc_hash");
+	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_user");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr ", ps, depth, &hsh->ptr))
-		return False;
-	if(!prs_uint8s(False, "hash", ps, depth, hsh->hash, sizeof(hsh->hash))) 
+	if(!smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
- Inits a SAMR_R_UNKNOWN_38 structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
-				char *dest_host, char *user_name,
-				char nt_newpass[516], uchar nt_oldhash[16],
-				char lm_newpass[516], uchar lm_oldhash[16])
+BOOL samr_io_r_delete_dom_user(char *desc, SAMR_R_DELETE_DOM_USER * r_u,
+			       prs_struct *ps, int depth)
 {
-	int len_dest_host = strlen(dest_host)+1;
-	int len_user_name = strlen(user_name)+1;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("init_samr_q_chgpasswd_user\n"));
+	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_user");
+	depth++;
 
-	q_u->ptr_0 = 1;
-	init_uni_hdr(&q_u->hdr_dest_host, len_dest_host);
-	init_unistr2(&q_u->uni_dest_host, dest_host, len_dest_host);  
-	init_uni_hdr(&q_u->hdr_user_name, len_user_name);
-	init_unistr2(&q_u->uni_user_name, user_name, len_user_name);  
+	if(!prs_align(ps))
+		return False;
 
-	init_enc_passwd(&q_u->nt_newpass, nt_newpass);
-	init_enc_hash(&q_u->nt_oldhash, nt_oldhash);
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
 
-	q_u->unknown = 0x01;
+	return True;
+}
 
-	init_enc_passwd(&q_u->lm_newpass, lm_newpass);
-	init_enc_hash  (&q_u->lm_oldhash, lm_oldhash);
+/*******************************************************************
+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.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_open_user(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_chgpasswd_user");
+	prs_debug(ps, depth, desc, "samr_io_q_open_user");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr_0", ps, depth, &q_u->ptr_0))
+	if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
 		return False;
 
-	if(!smb_io_unihdr ("", &q_u->hdr_dest_host, ps, depth))
-		return False;
-	if(!smb_io_unistr2("", &q_u->uni_dest_host, q_u->hdr_dest_host.buffer, ps, depth))
-		return False;
-	if(!smb_io_unihdr ("", &q_u->hdr_user_name, ps, depth))
+	if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
 		return False;
-	if(!smb_io_unistr2("", &q_u->uni_user_name, q_u->hdr_user_name.buffer, ps, depth))
+	if(!prs_uint32("user_rid ", ps, depth, &q_u->user_rid))
 		return False;
 
-	if(!samr_io_enc_passwd("nt_newpass", &q_u->nt_newpass, ps, depth))
-		return False;
-	if(!samr_io_enc_hash  ("nt_oldhash", &q_u->nt_oldhash, ps, depth))
+	return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_open_user(char *desc, SAMR_R_OPEN_USER * r_u,
+			 prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
 		return False;
 
-	if(!prs_uint32("unknown", ps, depth, &q_u->unknown))
+	prs_debug(ps, depth, desc, "samr_io_r_open_user");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
 
-	if(!samr_io_enc_passwd("lm_newpass", &q_u->lm_newpass, ps, depth))
+	if(!smb_io_pol_hnd("user_pol", &r_u->user_pol, ps, depth))
 		return False;
-	if(!samr_io_enc_hash("lm_oldhash", &q_u->lm_oldhash, ps, depth))
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
+
 /*******************************************************************
- Inits a SAMR_R_CHGPASSWD_USER structure.
+reads or writes a structure.
 ********************************************************************/
 
-void init_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status)
+void init_samr_q_create_user(SAMR_Q_CREATE_USER * q_u,
+			     POLICY_HND *pol,
+			     char *name,
+			     uint32 acb_info, uint32 access_mask)
 {
-	DEBUG(5,("init_r_chgpasswd_user\n"));
+	int len_name;
+	len_name = strlen(name);
 
-	r_u->status = status;
+	DEBUG(5, ("samr_init_samr_q_create_user\n"));
+
+	q_u->domain_pol = *pol;
+
+	init_uni_hdr(&q_u->hdr_name, len_name);
+	init_unistr2(&q_u->uni_name, name, len_name);
+
+	q_u->acb_info = acb_info;
+	q_u->access_mask = access_mask;
 }
 
 /*******************************************************************
- Reads or writes a structure.
+reads or writes a structure.
 ********************************************************************/
 
-BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_q_create_user(char *desc, SAMR_Q_CREATE_USER * q_u,
+			   prs_struct *ps, int depth)
 {
-	if (r_u == NULL)
+	if (q_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_chgpasswd_user");
+	prs_debug(ps, depth, desc, "samr_io_q_create_user");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("status", ps, depth, &r_u->status))
+	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_q_lookup_domain(char* desc, SAMR_Q_LOOKUP_DOMAIN* q_u, prs_struct *ps, int depth)
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_create_user(char *desc, SAMR_R_CREATE_USER * r_u,
+			   prs_struct *ps, int depth)
 {
-	if (q_u == NULL)
+	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_lookup_domain");
+	prs_debug(ps, depth, desc, "samr_io_r_create_user");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("connect_pol", &q_u->connect_pol, ps, depth))
+	if(!smb_io_pol_hnd("user_pol", &r_u->user_pol, ps, depth))
 		return False;
 
-	if(!smb_io_unihdr("hdr_domain", &q_u->hdr_domain, ps, depth))
+	if(!prs_uint32("unknown_0", ps, depth, &r_u->unknown_0))
 		return False;
-
-	if(!smb_io_unistr2("uni_domain", &q_u->uni_domain, q_u->hdr_domain.buffer, ps, depth))
+	if(!prs_uint32("user_rid ", ps, depth, &r_u->user_rid))
+		return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
-} 
+}
 
 /*******************************************************************
-makes a SAMR_R_LOOKUP_DOMAIN structure.
+inits a SAMR_Q_QUERY_USERINFO structure.
 ********************************************************************/
-BOOL init_samr_r_lookup_domain(SAMR_R_LOOKUP_DOMAIN * r_u,
-                               DOM_SID *dom_sid, uint32 status)
+
+void init_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO * q_u,
+				POLICY_HND *hnd, uint16 switch_value)
 {
-	if (r_u == NULL)
+	DEBUG(5, ("init_samr_q_query_userinfo\n"));
+
+	q_u->pol = *hnd;
+	q_u->switch_value = switch_value;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_query_userinfo(char *desc, SAMR_Q_QUERY_USERINFO * q_u,
+			      prs_struct *ps, int depth)
+{
+	if (q_u == NULL)
 		return False;
 
-	DEBUG(5, ("make_samr_r_lookup_domain\n"));
+	prs_debug(ps, depth, desc, "samr_io_q_query_userinfo");
+	depth++;
 
-	r_u->status = status;
-	r_u->ptr_sid = 0;
-	if (status == 0x0) {
-		r_u->ptr_sid = 1;
-		init_dom_sid2(&r_u->dom_sid, dom_sid);
-	}
+	if(!prs_align(ps))
+		return False;
+
+	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
+		return False;
+
+	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value)) /* 0x0015 or 0x0011 */
+		return False;
 
 	return True;
 }
 
 /*******************************************************************
-reads or writes a structure.
+reads or writes a LOGON_HRS structure.
 ********************************************************************/
-BOOL samr_io_r_lookup_domain(char *desc, SAMR_R_LOOKUP_DOMAIN * r_u,
-                             prs_struct *ps, int depth)
+
+static BOOL sam_io_logon_hrs(char *desc, LOGON_HRS * hrs,
+			     prs_struct *ps, int depth)
 {
-	if (r_u == NULL)
+	if (hrs == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_lookup_domain");
+	prs_debug(ps, depth, desc, "sam_io_logon_hrs");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("ptr", ps, depth, &r_u->ptr_sid))
+	if(!prs_uint32("len  ", ps, depth, &hrs->len))
 		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 (hrs->len > sizeof(hrs->hours)) {
+		DEBUG(3, ("sam_io_logon_hrs: truncating length from %d\n", hrs->len));
+		hrs->len = sizeof(hrs->hours);
 	}
 
-	if(!prs_uint32("status", ps, depth, &r_u->status))
+	if(!prs_uint8s(False, "hours", ps, depth, hrs->hours, hrs->len))
 		return False;
 
 	return True;
-}  
+}
+
+/*******************************************************************
+inits a SAM_USER_INFO_12 structure.
+********************************************************************/
+
+void init_sam_user_info12(SAM_USER_INFO_12 * usr,
+			  uint8 lm_pwd[16], uint8 nt_pwd[16])
+{
+	DEBUG(5, ("init_sam_user_info12\n"));
+
+	usr->lm_pwd_active =
+		memcpy(usr->lm_pwd, lm_pwd, sizeof(usr->lm_pwd)) ? 1 : 0;
+	usr->nt_pwd_active =
+		memcpy(usr->nt_pwd, nt_pwd, sizeof(usr->nt_pwd)) ? 1 : 0;
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_enum_domains(char *desc, SAMR_Q_ENUM_DOMAINS * q_e,
-                            prs_struct *ps, int depth)
+
+static BOOL sam_io_user_info12(char *desc, SAM_USER_INFO_12 * u,
+			prs_struct *ps, int depth)
 {
-	if (q_e == NULL)
+	if (u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_q_enum_domains");
+	DEBUG(0, ("possible security breach!\n"));
+
+	prs_debug(ps, depth, desc, "samr_io_r_user_info12");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_e->pol, ps, depth))
+	if(!prs_uint8s(False, "lm_pwd", ps, depth, u->lm_pwd, sizeof(u->lm_pwd)))
+		return False;
+	if(!prs_uint8s(False, "nt_pwd", ps, depth, u->nt_pwd, sizeof(u->nt_pwd)))
 		return False;
 
-	if(!prs_uint32("start_idx", ps, depth, &q_e->start_idx))
+	if(!prs_uint8("lm_pwd_active", ps, depth, &u->lm_pwd_active))
 		return False;
-	if(!prs_uint32("max_size ", ps, depth, &q_e->max_size))
+	if(!prs_uint8("nt_pwd_active", ps, depth, &u->nt_pwd_active))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAM_USER_INFO_10 structure.
+********************************************************************/
+
+void init_sam_user_info10(SAM_USER_INFO_10 * usr, uint32 acb_info)
+{
+	DEBUG(5, ("init_sam_user_info10\n"));
+
+	usr->acb_info = acb_info;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+static BOOL sam_io_user_info10(char *desc, SAM_USER_INFO_10 * usr,
+			prs_struct *ps, int depth)
+{
+	if (usr == NULL)
 		return False;
 
+	prs_debug(ps, depth, desc, "samr_io_r_user_info10");
+	depth++;
+
 	if(!prs_align(ps))
 		return False;
 
+	if(!prs_uint32("acb_info", ps, depth, &usr->acb_info))
+		return False;
+
 	return True;
-} 
+}
 
 /*******************************************************************
-makes a SAMR_R_ENUM_DOMAINS structure.
+inits a SAM_USER_INFO_11 structure.
 ********************************************************************/
-BOOL init_samr_r_enum_domains(SAMR_R_ENUM_DOMAINS * r_u,
-                              uint32 next_idx, fstring* domains, uint32 num_sam_entries)
+
+void init_sam_user_info11(SAM_USER_INFO_11 * usr,
+			  NTTIME * expiry,
+			  char *mach_acct,
+			  uint32 rid_user, uint32 rid_group, uint16 acct_ctrl)
 {
-  int i=0;
+	int len_mach_acct;
 
-  if (r_u == NULL)
-    return False;
+	DEBUG(5, ("init_sam_user_info11\n"));
 
-  DEBUG(5, ("init_samr_r_enum_domains\n"));
+	len_mach_acct = strlen(mach_acct);
 
-  r_u->next_idx = next_idx;
+	memcpy(&(usr->expiry), expiry, sizeof(usr->expiry));	/* expiry time or something? */
+	ZERO_STRUCT(usr->padding_1);	/* 0 - padding 24 bytes */
 
-  r_u->uni_dom_name = (UNISTR2*) malloc(sizeof(UNISTR2) * num_sam_entries);
-  r_u->sam = (SAM_ENTRY*) malloc(sizeof(SAM_ENTRY) * num_sam_entries);
-  if(r_u->uni_dom_name == NULL || r_u->sam == NULL)
-    {
-      free(r_u->uni_dom_name);
-      free(r_u->sam);
-      r_u->status = NT_STATUS_MEMORY_NOT_ALLOCATED;
-    }
+	init_uni_hdr(&usr->hdr_mach_acct, len_mach_acct);	/* unicode header for machine account */
+	usr->padding_2 = 0;	/* 0 - padding 4 bytes */
 
-  if(r_u->status == 0)
-    for(i=0;i<num_sam_entries;i++) /* only two domains to send */
-      {
-	init_unistr2(&r_u->uni_dom_name[i],domains[i], strlen(domains[i])+1);
-	init_sam_entry(&(r_u->sam[i]), strlen(domains[i])+1, 0);
-      }
-  else
-    {
-      num_sam_entries = 0;
-    }
-  
-  if (num_sam_entries != 0)
-    {
-      r_u->ptr_entries1 = 1;
-      r_u->ptr_entries2 = 1;
-      r_u->num_entries2 = num_sam_entries;
-      r_u->num_entries3 = num_sam_entries;
-
-      r_u->num_entries4 = num_sam_entries;
-    }
-  else
-    {
-      r_u->ptr_entries1 = 0;
-      r_u->num_entries2 = num_sam_entries;
-      r_u->ptr_entries2 = 1;
-    }
-  
-  return True;
+	usr->ptr_1 = 1;		/* pointer */
+	ZERO_STRUCT(usr->padding_3);	/* 0 - padding 32 bytes */
+	usr->padding_4 = 0;	/* 0 - padding 4 bytes */
+
+	usr->ptr_2 = 1;		/* pointer */
+	usr->padding_5 = 0;	/* 0 - padding 4 bytes */
+
+	usr->ptr_3 = 1;		/* pointer */
+	ZERO_STRUCT(usr->padding_6);	/* 0 - padding 32 bytes */
+
+	usr->rid_user = rid_user;
+	usr->rid_group = rid_group;
+
+	usr->acct_ctrl = acct_ctrl;
+	usr->unknown_3 = 0x0000;
+
+	usr->unknown_4 = 0x003f;	/* 0x003f      - 16 bit unknown */
+	usr->unknown_5 = 0x003c;	/* 0x003c      - 16 bit unknown */
+
+	ZERO_STRUCT(usr->padding_7);	/* 0 - padding 16 bytes */
+	usr->padding_8 = 0;	/* 0 - padding 4 bytes */
+
+	init_unistr2(&usr->uni_mach_acct, mach_acct, len_mach_acct);	/* unicode string for machine account */
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS * r_u,
-                            prs_struct *ps, int depth)
-{
-	uint32 i;
 
-	if (r_u == NULL)
+static BOOL sam_io_user_info11(char *desc, SAM_USER_INFO_11 * usr,
+			prs_struct *ps, int depth)
+{
+	if (usr == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_enum_domains");
+	prs_debug(ps, depth, desc, "samr_io_r_unknown_11");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint32("next_idx    ", ps, depth, &r_u->next_idx))
+	if(!prs_uint8s(False, "padding_0", ps, depth, usr->padding_0, sizeof(usr->padding_0)))
 		return False;
-	if(!prs_uint32("ptr_entries1", ps, depth, &r_u->ptr_entries1))
+
+	if(!smb_io_time("time", &usr->expiry, ps, depth))
 		return False;
 
-	if (r_u->ptr_entries1 != 0) {
+	if(!prs_uint8s(False, "padding_1", ps, depth, usr->padding_1, sizeof(usr->padding_1)))
+		return False;
 
-		if(!prs_uint32("num_entries2", ps, depth, &r_u->num_entries2))
-			return False;
+	if(!smb_io_unihdr("unihdr", &usr->hdr_mach_acct, ps, depth))
+		return False;
 
-		if(!prs_uint32("ptr_entries2", ps, depth, &r_u->ptr_entries2))
-			return False;
-		if(!prs_uint32("num_entries3", ps, depth, &r_u->num_entries3))
-			return False;
+	if(!prs_uint32("padding_2", ps, depth, &usr->padding_2))
+		return False;
 
-		if (UNMARSHALLING(ps)) {
-			r_u->sam = (SAM_ENTRY*) malloc(sizeof(SAM_ENTRY)* r_u->num_entries2);
-			r_u->uni_dom_name = (UNISTR2*) malloc(sizeof(UNISTR2)* r_u->num_entries2);
-		}
+	if(!prs_uint32("ptr_1    ", ps, depth, &usr->ptr_1))
+		return False;
+	if(!prs_uint8s(False, "padding_3", ps, depth, usr->padding_3, sizeof(usr->padding_3)))
+		return False;
 
-		if ((r_u->sam == NULL || r_u->uni_dom_name == NULL) && r_u->num_entries2 != 0) {
-			DEBUG(0, ("NULL pointers in SAMR_R_ENUM_DOMAINS\n"));
-			r_u->num_entries4 = 0;
-			r_u->status = NT_STATUS_MEMORY_NOT_ALLOCATED;
-			return False;
-		}
+	if(!prs_uint32("padding_4", ps, depth, &usr->padding_4))
+		return False;
 
-		for (i = 0; i < r_u->num_entries2; i++) {
-			fstring tmp;
-			slprintf(tmp, sizeof(tmp) - 1, "domains[%d]", i);
-			if (!sam_io_sam_entry(tmp, &r_u->sam[i], ps, depth))
-				return False;
-		}
+	if(!prs_uint32("ptr_2    ", ps, depth, &usr->ptr_2))
+		return False;
+	if(!prs_uint32("padding_5", ps, depth, &usr->padding_5))
+		return False;
 
-		for (i = 0; i < r_u->num_entries2; i++) {
-			fstring tmp;
-			slprintf(tmp, sizeof(tmp) - 1, "domains[%d]", i);
-			if(!smb_io_unistr2(tmp, &r_u->uni_dom_name[i], r_u->sam[i].hdr_name.buffer, ps, depth))
-				return False;
-			if(!prs_align(ps))
-				return False;
-		}
+	if(!prs_uint32("ptr_3    ", ps, depth, &usr->ptr_3))
+		return False;
+	if(!prs_uint8s(False, "padding_6", ps, depth, usr->padding_6,sizeof(usr->padding_6)))
+		return False;
 
-		if(!prs_align(ps))
-			return False;
+	if(!prs_uint32("rid_user ", ps, depth, &usr->rid_user))
+		return False;
+	if(!prs_uint32("rid_group", ps, depth, &usr->rid_group))
+		return False;
+	if(!prs_uint16("acct_ctrl", ps, depth, &usr->acct_ctrl))
+		return False;
+	if(!prs_uint16("unknown_3", ps, depth, &usr->unknown_3))
+		return False;
+	if(!prs_uint16("unknown_4", ps, depth, &usr->unknown_4))
+		return False;
+	if(!prs_uint16("unknown_5", ps, depth, &usr->unknown_5))
+		return False;
 
-	}
+	if(!prs_uint8s(False, "padding_7", ps, depth, usr->padding_7, sizeof(usr->padding_7)))
+		return False;
 
-	if(!prs_uint32("num_entries4", ps, depth, &r_u->num_entries4))
+	if(!prs_uint32("padding_8", ps, depth, &(usr->padding_8)))
 		return False;
-	if(!prs_uint32("status", ps, depth, &r_u->status))
+
+	if(!smb_io_unistr2("unistr2", &usr->uni_mach_acct, True, ps, depth))
+		return False;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint8s(False, "padding_9", ps, depth, usr->padding_9, sizeof(usr->padding_9)))
 		return False;
 
 	return True;
 }
 
+/*************************************************************************
+ init_sam_user_infoa
+
+ unknown_3 = 0x09f8 27fa
+ unknown_5 = 0x0001 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+
+void init_sam_user_info24(SAM_USER_INFO_24 * usr,
+			  char newpass[516], uint16 passlen)
+{
+	DEBUG(10, ("init_sam_user_info24: passlen: %d\n", passlen));
+	memcpy(usr->pass, newpass, sizeof(usr->pass));
+}
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_user_info12(char *desc, SAM_USER_INFO_12 *u, prs_struct *ps, int depth)
+
+static BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 * usr,
+			       prs_struct *ps, int depth)
 {
-	if (u == NULL)
+	if (usr == NULL)
 		return False;
 
-	DEBUG(0, ("possible security breach!\n"));
-
-	prs_debug(ps, depth, desc, "samr_io_r_user_info12");
+	prs_debug(ps, depth, desc, "sam_io_user_info24");
 	depth++;
 
 	if(!prs_align(ps))
 		return False;
 
-	if(!prs_uint8s(False, "lm_pwd", ps, depth, u->lm_pwd, sizeof(u->lm_pwd)))
-		return False;
-	if(!prs_uint8s(False, "nt_pwd", ps, depth, u->nt_pwd, sizeof(u->nt_pwd)))
-		return False;
-
-	if(!prs_uint8("lm_pwd_active", ps, depth, &u->lm_pwd_active))
-		return False;
-	if(!prs_uint8("nt_pwd_active", ps, depth, &u->nt_pwd_active))
+	if(!prs_uint8s(False, "password", ps, depth, usr->pass, sizeof(usr->pass)))
 		return False;
 
 	return True;
 }
 
+/*************************************************************************
+ init_sam_user_info23
+
+ unknown_3 = 0x09f8 27fa
+ unknown_5 = 0x0001 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+
+void init_sam_user_info23W(SAM_USER_INFO_23 * usr, NTTIME * logon_time,	/* all zeros */
+			NTTIME * logoff_time,	/* all zeros */
+			NTTIME * kickoff_time,	/* all zeros */
+			NTTIME * pass_last_set_time,	/* all zeros */
+			NTTIME * pass_can_change_time,	/* all zeros */
+			NTTIME * pass_must_change_time,	/* all zeros */
+			UNISTR2 *user_name,
+			UNISTR2 *full_name,
+			UNISTR2 *home_dir,
+			UNISTR2 *dir_drive,
+			UNISTR2 *log_scr,
+			UNISTR2 *prof_path,
+			UNISTR2 *desc,
+			UNISTR2 *wkstas,
+			UNISTR2 *unk_str,
+			UNISTR2 *mung_dial,
+			uint32 user_rid,	/* 0x0000 0000 */
+			uint32 group_rid,
+			uint32 acb_info,
+			uint32 unknown_3,
+			uint16 logon_divs,
+			LOGON_HRS * hrs,
+			uint32 unknown_5,
+			char newpass[516], uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? user_name->uni_str_len : 0;
+	int len_full_name = full_name != NULL ? full_name->uni_str_len : 0;
+	int len_home_dir = home_dir != NULL ? home_dir->uni_str_len : 0;
+	int len_dir_drive = dir_drive != NULL ? dir_drive->uni_str_len : 0;
+	int len_logon_script = log_scr != NULL ? log_scr->uni_str_len : 0;
+	int len_profile_path = prof_path != NULL ? prof_path->uni_str_len : 0;
+	int len_description = desc != NULL ? desc->uni_str_len : 0;
+	int len_workstations = wkstas != NULL ? wkstas->uni_str_len : 0;
+	int len_unknown_str = unk_str != NULL ? unk_str->uni_str_len : 0;
+	int len_munged_dial = mung_dial != NULL ? mung_dial->uni_str_len : 0;
+
+	usr->logon_time = *logon_time;	/* all zeros */
+	usr->logoff_time = *logoff_time;	/* all zeros */
+	usr->kickoff_time = *kickoff_time;	/* all zeros */
+	usr->pass_last_set_time = *pass_last_set_time;	/* all zeros */
+	usr->pass_can_change_time = *pass_can_change_time;	/* all zeros */
+	usr->pass_must_change_time = *pass_must_change_time;	/* all zeros */
+
+	init_uni_hdr(&usr->hdr_user_name, len_user_name);	/* NULL */
+	init_uni_hdr(&usr->hdr_full_name, len_full_name);
+	init_uni_hdr(&usr->hdr_home_dir, len_home_dir);
+	init_uni_hdr(&usr->hdr_dir_drive, len_dir_drive);
+	init_uni_hdr(&usr->hdr_logon_script, len_logon_script);
+	init_uni_hdr(&usr->hdr_profile_path, len_profile_path);
+	init_uni_hdr(&usr->hdr_acct_desc, len_description);
+	init_uni_hdr(&usr->hdr_workstations, len_workstations);
+	init_uni_hdr(&usr->hdr_unknown_str, len_unknown_str);
+	init_uni_hdr(&usr->hdr_munged_dial, len_munged_dial);
+
+	ZERO_STRUCT(usr->nt_pwd);
+	ZERO_STRUCT(usr->lm_pwd);
+
+	usr->user_rid = user_rid;	/* 0x0000 0000 */
+	usr->group_rid = group_rid;
+	usr->acb_info = acb_info;
+	usr->unknown_3 = unknown_3;	/* 09f8 27fa */
+
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
+	usr->ptr_logon_hrs = hrs ? 1 : 0;
+
+	ZERO_STRUCT(usr->padding1);
+
+	usr->unknown_5 = unknown_5;	/* 0x0001 0000 */
+
+	memcpy(usr->pass, newpass, sizeof(usr->pass));
+
+	copy_unistr2(&usr->uni_user_name, user_name);
+	copy_unistr2(&usr->uni_full_name, full_name);
+	copy_unistr2(&usr->uni_home_dir, home_dir);
+	copy_unistr2(&usr->uni_dir_drive, dir_drive);
+	copy_unistr2(&usr->uni_logon_script, log_scr);
+	copy_unistr2(&usr->uni_profile_path, prof_path);
+	copy_unistr2(&usr->uni_acct_desc, desc);
+	copy_unistr2(&usr->uni_workstations, wkstas);
+	copy_unistr2(&usr->uni_unknown_str, unk_str);
+	copy_unistr2(&usr->uni_munged_dial, mung_dial);
+
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
+	usr->padding4 = 0;
+
+	memcpy(&usr->logon_hrs, hrs, sizeof(usr->logon_hrs));
+}
+
+/*************************************************************************
+ init_sam_user_info23
+
+ unknown_3 = 0x09f8 27fa
+ unknown_5 = 0x0001 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+
+void init_sam_user_info23A(SAM_USER_INFO_23 * usr, NTTIME * logon_time,	/* all zeros */
+			   NTTIME * logoff_time,	/* all zeros */
+			   NTTIME * kickoff_time,	/* all zeros */
+			   NTTIME * pass_last_set_time,	/* all zeros */
+			   NTTIME * pass_can_change_time,	/* all zeros */
+			   NTTIME * pass_must_change_time,	/* all zeros */
+			   char *user_name,	/* NULL */
+			   char *full_name,
+			   char *home_dir, char *dir_drive, char *log_scr,
+			   char *prof_path, char *desc, char *wkstas,
+			   char *unk_str, char *mung_dial, uint32 user_rid,	/* 0x0000 0000 */
+			   uint32 group_rid, uint32 acb_info,
+			   uint32 unknown_3, uint16 logon_divs,
+			   LOGON_HRS * hrs, uint32 unknown_5,
+			   char newpass[516], uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? strlen(user_name) : 0;
+	int len_full_name = full_name != NULL ? strlen(full_name) : 0;
+	int len_home_dir = home_dir != NULL ? strlen(home_dir) : 0;
+	int len_dir_drive = dir_drive != NULL ? strlen(dir_drive) : 0;
+	int len_logon_script = log_scr != NULL ? strlen(log_scr) : 0;
+	int len_profile_path = prof_path != NULL ? strlen(prof_path) : 0;
+	int len_description = desc != NULL ? strlen(desc) : 0;
+	int len_workstations = wkstas != NULL ? strlen(wkstas) : 0;
+	int len_unknown_str = unk_str != NULL ? strlen(unk_str) : 0;
+	int len_munged_dial = mung_dial != NULL ? strlen(mung_dial) : 0;
+
+	usr->logon_time = *logon_time;	/* all zeros */
+	usr->logoff_time = *logoff_time;	/* all zeros */
+	usr->kickoff_time = *kickoff_time;	/* all zeros */
+	usr->pass_last_set_time = *pass_last_set_time;	/* all zeros */
+	usr->pass_can_change_time = *pass_can_change_time;	/* all zeros */
+	usr->pass_must_change_time = *pass_must_change_time;	/* all zeros */
+
+	init_uni_hdr(&usr->hdr_user_name, len_user_name);	/* NULL */
+	init_uni_hdr(&usr->hdr_full_name, len_full_name);
+	init_uni_hdr(&usr->hdr_home_dir, len_home_dir);
+	init_uni_hdr(&usr->hdr_dir_drive, len_dir_drive);
+	init_uni_hdr(&usr->hdr_logon_script, len_logon_script);
+	init_uni_hdr(&usr->hdr_profile_path, len_profile_path);
+	init_uni_hdr(&usr->hdr_acct_desc, len_description);
+	init_uni_hdr(&usr->hdr_workstations, len_workstations);
+	init_uni_hdr(&usr->hdr_unknown_str, len_unknown_str);
+	init_uni_hdr(&usr->hdr_munged_dial, len_munged_dial);
+
+	ZERO_STRUCT(usr->nt_pwd);
+	ZERO_STRUCT(usr->lm_pwd);
+
+	usr->user_rid = user_rid;	/* 0x0000 0000 */
+	usr->group_rid = group_rid;
+	usr->acb_info = acb_info;
+	usr->unknown_3 = unknown_3;	/* 09f8 27fa */
+
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
+	usr->ptr_logon_hrs = hrs ? 1 : 0;
+
+	ZERO_STRUCT(usr->padding1);
+
+	usr->unknown_5 = unknown_5;	/* 0x0001 0000 */
+
+	memcpy(usr->pass, newpass, sizeof(usr->pass));
+
+	init_unistr2(&usr->uni_user_name, user_name, len_user_name);	/* NULL */
+	init_unistr2(&usr->uni_full_name, full_name, len_full_name);
+	init_unistr2(&usr->uni_home_dir, home_dir, len_home_dir);
+	init_unistr2(&usr->uni_dir_drive, dir_drive, len_dir_drive);
+	init_unistr2(&usr->uni_logon_script, log_scr, len_logon_script);
+	init_unistr2(&usr->uni_profile_path, prof_path, len_profile_path);
+	init_unistr2(&usr->uni_acct_desc, desc, len_description);
+	init_unistr2(&usr->uni_workstations, wkstas, len_workstations);
+	init_unistr2(&usr->uni_unknown_str, unk_str, len_unknown_str);
+	init_unistr2(&usr->uni_munged_dial, mung_dial, len_munged_dial);
+
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
+	usr->padding4 = 0;
+
+	memcpy(&usr->logon_hrs, hrs, sizeof(usr->logon_hrs));
+}
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_user_info23(char *desc, SAM_USER_INFO_23 *usr, prs_struct *ps, int depth)
+
+static BOOL sam_io_user_info23(char *desc, SAM_USER_INFO_23 * usr,
+			       prs_struct *ps, int depth)
 {
 	if (usr == NULL)
 		return False;
@@ -4159,118 +5218,423 @@ static BOOL sam_io_user_info23(char *desc, SAM_USER_INFO_23 *usr, prs_struct *ps
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_time("logon_time", &usr->logon_time, ps, depth))
+	if(!smb_io_time("logon_time           ", &usr->logon_time, ps, depth))
 		return False;
-	if(!smb_io_time("logoff_time", &usr->logoff_time, ps, depth))
+	if(!smb_io_time("logoff_time          ", &usr->logoff_time, ps, depth))
 		return False;
-	if(!smb_io_time("kickoff_time", &usr->kickoff_time, ps, depth))
+	if(!smb_io_time("kickoff_time         ", &usr->kickoff_time, ps, depth))
 		return False;
-	if(!smb_io_time("pass_last_set_time", &usr->pass_last_set_time, ps, depth))
+	if(!smb_io_time("pass_last_set_time   ", &usr->pass_last_set_time, ps, depth))
 		return False;
-	if(!smb_io_time("pass_can_change_time", &usr->pass_can_change_time, ps, depth))
+	if(!smb_io_time("pass_can_change_time ", &usr->pass_can_change_time, ps, depth))
 		return False;
 	if(!smb_io_time("pass_must_change_time", &usr->pass_must_change_time, ps, depth))
 		return False;
 
-	if(!smb_io_unihdr("hdr_user_name", &usr->hdr_user_name, ps, depth))	/* username unicode string header */
+	if(!smb_io_unihdr("hdr_user_name   ", &usr->hdr_user_name, ps, depth))	/* username unicode string header */
 		return False;
-	if(!smb_io_unihdr("hdr_full_name", &usr->hdr_full_name, ps, depth))	/* user's full name unicode string header */
+	if(!smb_io_unihdr("hdr_full_name   ", &usr->hdr_full_name, ps, depth))	/* user's full name unicode string header */
 		return False;
-	if(!smb_io_unihdr("hdr_home_dir", &usr->hdr_home_dir, ps, depth))	/* home directory unicode string header */
+	if(!smb_io_unihdr("hdr_home_dir    ", &usr->hdr_home_dir, ps, depth))	/* home directory unicode string header */
 		return False;
-	if(!smb_io_unihdr("hdr_dir_drive", &usr->hdr_dir_drive, ps, depth))	/* home directory drive */
+	if(!smb_io_unihdr("hdr_dir_drive   ", &usr->hdr_dir_drive, ps, depth))	/* home directory drive */
 		return False;
 	if(!smb_io_unihdr("hdr_logon_script", &usr->hdr_logon_script, ps, depth))	/* logon script unicode string header */
 		return False;
 	if(!smb_io_unihdr("hdr_profile_path", &usr->hdr_profile_path, ps, depth))	/* profile path unicode string header */
 		return False;
-	if(!smb_io_unihdr("hdr_acct_desc", &usr->hdr_acct_desc, ps, depth))	/* account desc */
+	if(!smb_io_unihdr("hdr_acct_desc   ", &usr->hdr_acct_desc, ps, depth))	/* account desc */
 		return False;
 	if(!smb_io_unihdr("hdr_workstations", &usr->hdr_workstations, ps, depth))	/* wkstas user can log on from */
 		return False;
-	if(!smb_io_unihdr("hdr_unknown_str", &usr->hdr_unknown_str, ps, depth))	/* unknown string */
+	if(!smb_io_unihdr("hdr_unknown_str ", &usr->hdr_unknown_str, ps, depth))	/* unknown string */
 		return False;
-	if(!smb_io_unihdr("hdr_munged_dial", &usr->hdr_munged_dial, ps, depth))	/* wkstas user can log on from */
+	if(!smb_io_unihdr("hdr_munged_dial ", &usr->hdr_munged_dial, ps, depth))	/* wkstas user can log on from */
 		return False;
 
-	if(!prs_uint8s(False, "lm_pwd", ps, depth, usr->lm_pwd, sizeof(usr->lm_pwd)))
+	if(!prs_uint8s(False, "lm_pwd        ", ps, depth, usr->lm_pwd, sizeof(usr->lm_pwd)))
 		return False;
-	if(!prs_uint8s(False, "nt_pwd", ps, depth, usr->nt_pwd, sizeof(usr->nt_pwd)))
+	if(!prs_uint8s(False, "nt_pwd        ", ps, depth, usr->nt_pwd, sizeof(usr->nt_pwd)))
 		return False;
 
-	if(!prs_uint32("user_rid", ps, depth, &usr->user_rid))	/* User ID */
+	if(!prs_uint32("user_rid      ", ps, depth, &usr->user_rid))	/* User ID */
 		return False;
-	if(!prs_uint32("group_rid", ps, depth, &usr->group_rid))	/* Group ID */
+	if(!prs_uint32("group_rid     ", ps, depth, &usr->group_rid))	/* Group ID */
 		return False;
-	if(!prs_uint32("acb_info", ps, depth, &usr->acb_info))
+	if(!prs_uint32("acb_info      ", ps, depth, &usr->acb_info))
 		return False;
 
-	if(!prs_uint32("unknown_3", ps, depth, &usr->unknown_3))
+	if(!prs_uint32("unknown_3     ", ps, depth, &usr->unknown_3))
 		return False;
-	if(!prs_uint16("logon_divs", ps, depth, &usr->logon_divs))	/* logon divisions per week */
+	if(!prs_uint16("logon_divs    ", ps, depth, &usr->logon_divs))	/* logon divisions per week */
 		return False;
 	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("ptr_logon_hrs", ps, depth, &usr->ptr_logon_hrs))
+	if(!prs_uint32("ptr_logon_hrs ", ps, depth, &usr->ptr_logon_hrs))
 		return False;
-	if(!prs_uint8s(False, "padding1", ps, depth, usr->padding1, sizeof(usr->padding1)))
+	if(!prs_uint8s(False, "padding1      ", ps, depth, usr->padding1, sizeof(usr->padding1)))
 		return False;
-	if(!prs_uint32("unknown_5", ps, depth, &usr->unknown_5))
+	if(!prs_uint32("unknown_5     ", ps, depth, &usr->unknown_5))
 		return False;
 
-	if(!prs_uint8s(False, "password", ps, depth, usr->pass, sizeof(usr->pass)))
+	if(!prs_uint8s(False, "password      ", ps, depth, usr->pass, sizeof(usr->pass)))
 		return False;
 
 	/* here begins pointed-to data */
 
-	if(!prs_align_needed(ps, usr->hdr_user_name.buffer))
+	if(!smb_io_unistr2("uni_user_name   ", &usr->uni_user_name, usr->hdr_user_name.buffer, ps, depth))	/* username unicode string */
 		return False;
-	if(!smb_io_unistr2("uni_user_name", &usr->uni_user_name, usr->hdr_user_name.buffer, ps, depth))	/* username unicode string */
+
+	if(!smb_io_unistr2("uni_full_name   ", &usr->uni_full_name, usr->hdr_full_name.buffer, ps, depth))	/* user's full name unicode string */
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_full_name.buffer))
+
+	if(!smb_io_unistr2("uni_home_dir    ", &usr->uni_home_dir, usr->hdr_home_dir.buffer, ps, depth))	/* home directory unicode string */
 		return False;
-	if(!smb_io_unistr2("uni_full_name", &usr->uni_full_name, usr->hdr_full_name.buffer, ps, depth))	/* user's full name unicode string */
+
+	if(!smb_io_unistr2("uni_dir_drive   ", &usr->uni_dir_drive, usr->hdr_dir_drive.buffer, ps, depth))	/* home directory drive unicode string */
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_home_dir.buffer))
+
+	if(!smb_io_unistr2("uni_logon_script", &usr->uni_logon_script, usr->hdr_logon_script.buffer, ps, depth))	/* logon script unicode string */
+		return False;
+
+	if(!smb_io_unistr2("uni_profile_path", &usr->uni_profile_path, usr->hdr_profile_path.buffer, ps, depth))	/* profile path unicode string */
 		return False;
-	if(!smb_io_unistr2("uni_home_dir", &usr->uni_home_dir, usr->hdr_home_dir.buffer, ps, depth))	/* home directory unicode string */
+
+	if(!smb_io_unistr2("uni_acct_desc   ", &usr->uni_acct_desc, usr->hdr_acct_desc.buffer, ps, depth))	/* user desc unicode string */
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_dir_drive.buffer))
+
+	if(!smb_io_unistr2("uni_workstations", &usr->uni_workstations, usr->hdr_workstations.buffer, ps, depth))	/* worksations user can log on from */
 		return False;
-	if(!smb_io_unistr2("uni_dir_drive", &usr->uni_dir_drive, usr->hdr_dir_drive.buffer, ps, depth))	/* home directory drive unicode string */
+
+	if(!smb_io_unistr2("uni_unknown_str ", &usr->uni_unknown_str, usr->hdr_unknown_str.buffer, ps, depth))	/* unknown string */
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_logon_script.buffer))
+
+	if(!smb_io_unistr2("uni_munged_dial ", &usr->uni_munged_dial, usr->hdr_munged_dial.buffer, ps, depth))
 		return False;
-	if(!smb_io_unistr2("uni_logon_script", &usr->uni_logon_script, usr->hdr_logon_script.buffer, ps, depth))	/* logon script unicode string */
+
+	/* ok, this is only guess-work (as usual) */
+	if (usr->ptr_logon_hrs) {
+		if(!prs_uint32("unknown_6     ", ps, depth, &usr->unknown_6))
+			return False;
+		if(!prs_uint32("padding4      ", ps, depth, &usr->padding4))
+			return False;
+		if(!sam_io_logon_hrs("logon_hrs", &usr->logon_hrs, ps, depth))
+			return False;
+	} else if (UNMARSHALLING(ps)) {
+		usr->unknown_6 = 0;
+		usr->padding4 = 0;
+	}
+
+	return True;
+}
+
+
+/*************************************************************************
+ init_sam_user_info21W
+
+ unknown_3 = 0x00ff ffff
+ unknown_5 = 0x0002 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+
+void init_sam_user_info21W(SAM_USER_INFO_21 * usr,
+			   NTTIME * logon_time,
+			   NTTIME * logoff_time,
+			   NTTIME * kickoff_time,
+			   NTTIME * pass_last_set_time,
+			   NTTIME * pass_can_change_time,
+			   NTTIME * pass_must_change_time,
+			   UNISTR2 *user_name,
+			   UNISTR2 *full_name,
+			   UNISTR2 *home_dir,
+			   UNISTR2 *dir_drive,
+			   UNISTR2 *log_scr,
+			   UNISTR2 *prof_path,
+			   UNISTR2 *desc,
+			   UNISTR2 *wkstas,
+			   UNISTR2 *unk_str,
+			   UNISTR2 *mung_dial,
+			   uchar lm_pwd[16],
+			   uchar nt_pwd[16],
+			   uint32 user_rid,
+			   uint32 group_rid,
+			   uint32 acb_info,
+			   uint32 unknown_3,
+			   uint16 logon_divs,
+			   LOGON_HRS * hrs,
+			   uint32 unknown_5, uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? user_name->uni_str_len : 0;
+	int len_full_name = full_name != NULL ? full_name->uni_str_len : 0;
+	int len_home_dir = home_dir != NULL ? home_dir->uni_str_len : 0;
+	int len_dir_drive = dir_drive != NULL ? dir_drive->uni_str_len : 0;
+	int len_logon_script = log_scr != NULL ? log_scr->uni_str_len : 0;
+	int len_profile_path = prof_path != NULL ? prof_path->uni_str_len : 0;
+	int len_description = desc != NULL ? desc->uni_str_len : 0;
+	int len_workstations = wkstas != NULL ? wkstas->uni_str_len : 0;
+	int len_unknown_str = unk_str != NULL ? unk_str->uni_str_len : 0;
+	int len_munged_dial = mung_dial != NULL ? mung_dial->uni_str_len : 0;
+
+	usr->logon_time = *logon_time;
+	usr->logoff_time = *logoff_time;
+	usr->kickoff_time = *kickoff_time;
+	usr->pass_last_set_time = *pass_last_set_time;
+	usr->pass_can_change_time = *pass_can_change_time;
+	usr->pass_must_change_time = *pass_must_change_time;
+
+	init_uni_hdr(&usr->hdr_user_name, len_user_name);
+	init_uni_hdr(&usr->hdr_full_name, len_full_name);
+	init_uni_hdr(&usr->hdr_home_dir, len_home_dir);
+	init_uni_hdr(&usr->hdr_dir_drive, len_dir_drive);
+	init_uni_hdr(&usr->hdr_logon_script, len_logon_script);
+	init_uni_hdr(&usr->hdr_profile_path, len_profile_path);
+	init_uni_hdr(&usr->hdr_acct_desc, len_description);
+	init_uni_hdr(&usr->hdr_workstations, len_workstations);
+	init_uni_hdr(&usr->hdr_unknown_str, len_unknown_str);
+	init_uni_hdr(&usr->hdr_munged_dial, len_munged_dial);
+
+	memcpy(usr->lm_pwd, lm_pwd, sizeof(usr->lm_pwd));
+	memcpy(usr->nt_pwd, nt_pwd, sizeof(usr->nt_pwd));
+
+	usr->user_rid = user_rid;
+	usr->group_rid = group_rid;
+	usr->acb_info = acb_info;
+	usr->unknown_3 = unknown_3;	/* 0x00ff ffff */
+
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
+	usr->ptr_logon_hrs = hrs ? 1 : 0;
+	usr->unknown_5 = unknown_5;	/* 0x0002 0000 */
+
+	ZERO_STRUCT(usr->padding1);
+
+	copy_unistr2(&usr->uni_user_name, user_name);
+	copy_unistr2(&usr->uni_full_name, full_name);
+	copy_unistr2(&usr->uni_home_dir, home_dir);
+	copy_unistr2(&usr->uni_dir_drive, dir_drive);
+	copy_unistr2(&usr->uni_logon_script, log_scr);
+	copy_unistr2(&usr->uni_profile_path, prof_path);
+	copy_unistr2(&usr->uni_acct_desc, desc);
+	copy_unistr2(&usr->uni_workstations, wkstas);
+	copy_unistr2(&usr->uni_unknown_str, unk_str);
+	copy_unistr2(&usr->uni_munged_dial, mung_dial);
+
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
+	usr->padding4 = 0;
+
+	memcpy(&usr->logon_hrs, hrs, sizeof(usr->logon_hrs));
+}
+
+/*************************************************************************
+ init_sam_user_info21
+
+ unknown_3 = 0x00ff ffff
+ unknown_5 = 0x0002 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+
+void init_sam_user_info21A(SAM_USER_INFO_21 *usr, SAM_ACCOUNT *pw)
+{
+	NTTIME 		logon_time, logoff_time, kickoff_time,
+			pass_last_set_time, pass_can_change_time,
+			pass_must_change_time;
+
+	int 		len_user_name, len_full_name, len_home_dir,
+			len_dir_drive, len_logon_script, len_profile_path,
+			len_description, len_workstations, len_unknown_str,
+			len_munged_dial;
+			
+	char*		user_name = pdb_get_username(pw);
+	char*		full_name = pdb_get_fullname(pw);
+	char*		home_dir  = pdb_get_homedir(pw);
+	char*		dir_drive = pdb_get_dirdrive(pw);
+	char*		logon_script = pdb_get_logon_script(pw);
+	char*		profile_path = pdb_get_profile_path(pw);
+	char*		description = pdb_get_acct_desc(pw);
+	char*		workstations = pdb_get_workstations(pw);
+	char*		munged_dial = pdb_get_munged_dial(pw);
+
+	len_user_name    = user_name    != NULL ? strlen(user_name   )+1 : 0;
+	len_full_name    = full_name    != NULL ? strlen(full_name   )+1 : 0;
+	len_home_dir     = home_dir     != NULL ? strlen(home_dir    )+1 : 0;
+	len_dir_drive    = dir_drive    != NULL ? strlen(dir_drive   )+1 : 0;
+	len_logon_script = logon_script != NULL ? strlen(logon_script)+1 : 0;
+	len_profile_path = profile_path != NULL ? strlen(profile_path)+1 : 0;
+	len_description  = description  != NULL ? strlen(description )+1 : 0;
+	len_workstations = workstations != NULL ? strlen(workstations)+1 : 0;
+	len_unknown_str  = 0;
+	len_munged_dial  = munged_dial  != NULL ? strlen(munged_dial )+1 : 0;
+
+
+	/* Create NTTIME structs */
+	unix_to_nt_time (&logon_time, 		pdb_get_logon_time(pw));
+	unix_to_nt_time (&logoff_time, 		pdb_get_logoff_time(pw));
+	unix_to_nt_time (&kickoff_time, 	pdb_get_kickoff_time(pw));
+	unix_to_nt_time (&pass_last_set_time, 	pdb_get_pass_last_set_time(pw));
+	unix_to_nt_time (&pass_can_change_time,	pdb_get_pass_can_change_time(pw));
+	unix_to_nt_time (&pass_must_change_time,pdb_get_pass_must_change_time(pw));
+	
+	/* structure assignment */
+	usr->logon_time            = logon_time;
+	usr->logoff_time           = logoff_time;
+	usr->kickoff_time          = kickoff_time;
+	usr->pass_last_set_time    = pass_last_set_time;
+	usr->pass_can_change_time  = pass_can_change_time;
+	usr->pass_must_change_time = pass_must_change_time;
+
+	init_uni_hdr(&usr->hdr_user_name, len_user_name);
+	init_uni_hdr(&usr->hdr_full_name, len_full_name);
+	init_uni_hdr(&usr->hdr_home_dir, len_home_dir);
+	init_uni_hdr(&usr->hdr_dir_drive, len_dir_drive);
+	init_uni_hdr(&usr->hdr_logon_script, len_logon_script);
+	init_uni_hdr(&usr->hdr_profile_path, len_profile_path);
+	init_uni_hdr(&usr->hdr_acct_desc, len_description);
+	init_uni_hdr(&usr->hdr_workstations, len_workstations);
+	init_uni_hdr(&usr->hdr_unknown_str, len_unknown_str);
+	init_uni_hdr(&usr->hdr_munged_dial, len_munged_dial);
+
+	ZERO_STRUCT(usr->nt_pwd);
+	ZERO_STRUCT(usr->lm_pwd);
+
+	usr->user_rid  = pdb_get_user_rid(pw);
+	usr->group_rid = pdb_get_group_rid(pw);
+	usr->acb_info  = pdb_get_acct_ctrl(pw);
+	usr->unknown_3 = pdb_get_unknown3(pw);
+
+	usr->logon_divs = pdb_get_logon_divs(pw); 
+	usr->ptr_logon_hrs = pdb_get_hours(pw) ? 1 : 0;
+	usr->unknown_5 = pdb_get_unknown5(pw); /* 0x0002 0000 */
+
+	ZERO_STRUCT(usr->padding1);
+
+	init_unistr2(&usr->uni_user_name, user_name, len_user_name);
+	init_unistr2(&usr->uni_full_name, full_name, len_full_name);
+	init_unistr2(&usr->uni_home_dir, home_dir, len_home_dir);
+	init_unistr2(&usr->uni_dir_drive, dir_drive, len_dir_drive);
+	init_unistr2(&usr->uni_logon_script, logon_script, len_logon_script);
+	init_unistr2(&usr->uni_profile_path, profile_path, len_profile_path);
+	init_unistr2(&usr->uni_acct_desc, description, len_description);
+	init_unistr2(&usr->uni_workstations, workstations, len_workstations);
+	init_unistr2(&usr->uni_unknown_str, NULL, len_unknown_str);
+	init_unistr2(&usr->uni_munged_dial, munged_dial, len_munged_dial);
+
+	usr->unknown_6 = pdb_get_unknown6(pw);
+	usr->padding4 = 0;
+
+	if (pdb_get_hours(pw)) {
+		usr->logon_hrs.len = pdb_get_hours_len(pw);
+		memcpy(&usr->logon_hrs.hours, pdb_get_hours(pw), MAX_HOURS_LEN);
+	} else
+		memset(&usr->logon_hrs, 0xff, sizeof(usr->logon_hrs));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+static BOOL sam_io_user_info21(char *desc, SAM_USER_INFO_21 * usr,
+			prs_struct *ps, int depth)
+{
+	if (usr == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "sam_io_user_info21");
+	depth++;
+
+	if(!prs_align(ps))
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_profile_path.buffer))
+
+	if(!smb_io_time("logon_time           ", &usr->logon_time, ps, depth))
 		return False;
-	if(!smb_io_unistr2("uni_profile_path", &usr->uni_profile_path, usr->hdr_profile_path.buffer, ps, depth))	/* profile path unicode string */
+	if(!smb_io_time("logoff_time          ", &usr->logoff_time, ps, depth))
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_acct_desc.buffer))
+	if(!smb_io_time("pass_last_set_time   ", &usr->pass_last_set_time, ps,depth))
 		return False;
-	if(!smb_io_unistr2("uni_acct_desc", &usr->uni_acct_desc, usr->hdr_acct_desc.buffer, ps, depth))	/* user desc unicode string */
+	if(!smb_io_time("kickoff_time         ", &usr->kickoff_time, ps, depth))
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_workstations.buffer))
+	if(!smb_io_time("pass_can_change_time ", &usr->pass_can_change_time, ps,depth))
 		return False;
-	if(!smb_io_unistr2("uni_workstations", &usr->uni_workstations, usr->hdr_workstations.buffer, ps, depth))	/* worksations user can log on from */
+	if(!smb_io_time("pass_must_change_time", &usr->pass_must_change_time,  ps, depth))
+		return False;
+
+	if(!smb_io_unihdr("hdr_user_name   ", &usr->hdr_user_name, ps, depth))	/* username unicode string header */
+		return False;
+	if(!smb_io_unihdr("hdr_full_name   ", &usr->hdr_full_name, ps, depth))	/* user's full name unicode string header */
+		return False;
+	if(!smb_io_unihdr("hdr_home_dir    ", &usr->hdr_home_dir, ps, depth))	/* home directory unicode string header */
+		return False;
+	if(!smb_io_unihdr("hdr_dir_drive   ", &usr->hdr_dir_drive, ps, depth))	/* home directory drive */
+		return False;
+	if(!smb_io_unihdr("hdr_logon_script", &usr->hdr_logon_script, ps, depth))	/* logon script unicode string header */
+		return False;
+	if(!smb_io_unihdr("hdr_profile_path", &usr->hdr_profile_path, ps, depth))	/* profile path unicode string header */
+		return False;
+	if(!smb_io_unihdr("hdr_acct_desc   ", &usr->hdr_acct_desc, ps, depth))	/* account desc */
+		return False;
+	if(!smb_io_unihdr("hdr_workstations", &usr->hdr_workstations, ps, depth))	/* wkstas user can log on from */
+		return False;
+	if(!smb_io_unihdr("hdr_unknown_str ", &usr->hdr_unknown_str, ps, depth))	/* unknown string */
+		return False;
+	if(!smb_io_unihdr("hdr_munged_dial ", &usr->hdr_munged_dial, ps, depth))	/* wkstas user can log on from */
+		return False;
+
+	if(!prs_uint8s(False, "lm_pwd        ", ps, depth, usr->lm_pwd, sizeof(usr->lm_pwd)))
+		return False;
+	if(!prs_uint8s(False, "nt_pwd        ", ps, depth, usr->nt_pwd, sizeof(usr->nt_pwd)))
+		return False;
+
+	if(!prs_uint32("user_rid      ", ps, depth, &usr->user_rid))	/* User ID */
+		return False;
+	if(!prs_uint32("group_rid     ", ps, depth, &usr->group_rid))	/* Group ID */
+		return False;
+	if(!prs_uint32("acb_info      ", ps, depth, &usr->acb_info))
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_unknown_str.buffer))
+
+	if(!prs_uint32("unknown_3     ", ps, depth, &usr->unknown_3))
+		return False;
+	if(!prs_uint16("logon_divs    ", ps, depth, &usr->logon_divs))	/* logon divisions per week */
+		return False;
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("ptr_logon_hrs ", ps, depth, &usr->ptr_logon_hrs))
+		return False;
+	if(!prs_uint32("unknown_5     ", ps, depth, &usr->unknown_5))
+		return False;
+
+	if(!prs_uint8s(False, "padding1      ", ps, depth, usr->padding1, sizeof(usr->padding1)))
+		return False;
+
+	/* here begins pointed-to data */
+
+	if(!smb_io_unistr2("uni_user_name   ", &usr->uni_user_name,usr->hdr_user_name.buffer, ps, depth))	/* username unicode string */
+		return False;
+	if(!smb_io_unistr2("uni_full_name   ", &usr->uni_full_name, usr->hdr_full_name.buffer, ps, depth))	/* user's full name unicode string */
+		return False;
+	if(!smb_io_unistr2("uni_home_dir    ", &usr->uni_home_dir, usr->hdr_home_dir.buffer, ps, depth))	/* home directory unicode string */
 		return False;
-	if(!smb_io_unistr2("uni_unknown_str", &usr->uni_unknown_str, usr->hdr_unknown_str.buffer, ps, depth))	/* unknown string */
+	if(!smb_io_unistr2("uni_dir_drive   ", &usr->uni_dir_drive, usr->hdr_dir_drive.buffer, ps, depth))	/* home directory drive unicode string */
 		return False;
-	if(!prs_align_needed(ps, usr->hdr_munged_dial.buffer))
+	if(!smb_io_unistr2("uni_logon_script", &usr->uni_logon_script, usr->hdr_logon_script.buffer, ps, depth))	/* logon script unicode string */
+		return False;
+	if(!smb_io_unistr2("uni_profile_path", &usr->uni_profile_path, usr->hdr_profile_path.buffer, ps, depth))	/* profile path unicode string */
 		return False;
-	if(!smb_io_unistr2("uni_munged_dial", &usr->uni_munged_dial, usr->hdr_munged_dial.buffer, ps, depth))	/* worksations user can log on from */
+	if(!smb_io_unistr2("uni_acct_desc   ", &usr->uni_acct_desc, usr->hdr_acct_desc.buffer, ps, depth))	/* user desc unicode string */
+		return False;
+	if(!smb_io_unistr2("uni_workstations", &usr->uni_workstations, usr->hdr_workstations.buffer, ps, depth))	/* worksations user can log on from */
+		return False;
+	if(!smb_io_unistr2("uni_unknown_str ", &usr->uni_unknown_str, usr->hdr_unknown_str.buffer, ps, depth))	/* unknown string */
+		return False;
+	if(!smb_io_unistr2("uni_munged_dial ", &usr->uni_munged_dial,usr->hdr_munged_dial.buffer, ps, depth))	/* worksations user can log on from */
 		return False;
 
 	/* ok, this is only guess-work (as usual) */
 	if (usr->ptr_logon_hrs) {
 		if(!prs_align(ps))
 			return False;
-		if(!prs_uint32("unknown_6", ps, depth, &usr->unknown_6))
+		if(!prs_uint32("unknown_6     ", ps, depth, &usr->unknown_6))
 			return False;
-		if(!prs_uint32("padding4", ps, depth, &usr->padding4))
+		if(!prs_uint32("padding4      ", ps, depth, &usr->padding4))
 			return False;
 		if(!sam_io_logon_hrs("logon_hrs", &usr->logon_hrs, ps, depth))
 			return False;
@@ -4283,36 +5647,123 @@ static BOOL sam_io_user_info23(char *desc, SAM_USER_INFO_23 *usr, prs_struct *ps
 }
 
 /*******************************************************************
-reads or writes a structure.
+inits a SAM_USERINFO_CTR structure.
 ********************************************************************/
-static BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 *usr, prs_struct *ps, int depth)
+
+uint32 make_samr_userinfo_ctr_usr21(TALLOC_CTX *ctx, SAM_USERINFO_CTR * ctr,
+				    uint16 switch_value,
+				    SAM_USER_INFO_21 * usr)
 {
-	if (usr == NULL)
-		return False;
+	DEBUG(5, ("init_samr_userinfo_ctr\n"));
 
-	prs_debug(ps, depth, desc, "sam_io_user_info24");
-	depth++;
+	ctr->switch_value = switch_value;
+	ctr->info.id = NULL;
 
-	if(!prs_align(ps))
-		return False;
+	switch (switch_value) {
+	case 0x10:
+		ctr->info.id10 = (SAM_USER_INFO_10 *)talloc_zero(ctx,sizeof(SAM_USER_INFO_10));
+		if (ctr->info.id10 == NULL)
+			return NT_STATUS_NO_MEMORY;
 
-	if(!prs_uint8s(False, "password", ps, depth, usr->pass, sizeof(usr->pass)))
-		return False;
+		init_sam_user_info10(ctr->info.id10, usr->acb_info);
+		break;
+#if 0
+/* whoops - got this wrong.  i think.  or don't understand what's happening. */
+	case 0x11:
+		{
+			NTTIME expire;
+			info = (void *)&id11;
+
+			expire.low = 0xffffffff;
+			expire.high = 0x7fffffff;
+
+			ctr->info.id = (SAM_USER_INFO_11 *) talloc_zero(ctx,sizeof(*ctr->info.id11));
+			init_sam_user_info11(ctr->info.id11, &expire,
+					     "BROOKFIELDS$",	/* name */
+					     0x03ef,	/* user rid */
+					     0x201,	/* group rid */
+					     0x0080);	/* acb info */
 
-	return True;
+			break;
+		}
+#endif
+	case 0x12:
+		ctr->info.id12 = (SAM_USER_INFO_12 *)talloc_zero(ctx,sizeof(SAM_USER_INFO_12));
+		if (ctr->info.id12 == NULL)
+			return NT_STATUS_NO_MEMORY;
+
+		init_sam_user_info12(ctr->info.id12, usr->lm_pwd, usr->nt_pwd);
+		break;
+	case 21:
+		{
+			SAM_USER_INFO_21 *cusr;
+			cusr = (SAM_USER_INFO_21 *)talloc_zero(ctx,sizeof(SAM_USER_INFO_21));
+			ctr->info.id21 = cusr;
+			if (ctr->info.id21 == NULL)
+				return NT_STATUS_NO_MEMORY;
+			memcpy(cusr, usr, sizeof(*usr));
+			memset(cusr->lm_pwd, 0, sizeof(cusr->lm_pwd));
+			memset(cusr->nt_pwd, 0, sizeof(cusr->nt_pwd));
+			break;
+		}
+	default:
+		DEBUG(4,("make_samr_userinfo_ctr: unsupported info\n"));
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	return NT_STATUS_NOPROBLEMO;
+}
+
+/*******************************************************************
+inits a SAM_USERINFO_CTR structure.
+********************************************************************/
+
+void init_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr, uchar * sess_key,
+			    uint16 switch_value, void *info)
+{
+	DEBUG(5, ("init_samr_userinfo_ctr\n"));
+
+	ctr->switch_value = switch_value;
+	ctr->info.id = info;
+
+	switch (switch_value) {
+	case 0x18:
+		SamOEMhash(ctr->info.id24->pass, sess_key, 1);
+		dump_data(100, (char *)sess_key, 16);
+		dump_data(100, (char *)ctr->info.id24->pass, 516);
+		break;
+	case 0x17:
+		SamOEMhash(ctr->info.id23->pass, sess_key, 1);
+		dump_data(100, (char *)sess_key, 16);
+		dump_data(100, (char *)ctr->info.id23->pass, 516);
+		break;
+	default:
+		DEBUG(4,("init_samr_userinfo_ctr: unsupported switch level\n"));
+	}
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL samr_io_userinfo_ctr(char *desc, SAM_USERINFO_CTR *ctr, prs_struct *ps, int depth)
+
+static BOOL samr_io_userinfo_ctr(char *desc, SAM_USERINFO_CTR **ppctr,
+				 prs_struct *ps, int depth)
 {
-	if (ctr == NULL)
-		return False;
+	BOOL ret;
+	SAM_USERINFO_CTR *ctr;
 
 	prs_debug(ps, depth, desc, "samr_io_userinfo_ctr");
 	depth++;
 
+	if (UNMARSHALLING(ps)) {
+		ctr = (SAM_USERINFO_CTR *)prs_alloc_mem(ps,sizeof(SAM_USERINFO_CTR));
+		if (ctr == NULL)
+			return False;
+		*ppctr = ctr;
+	} else {
+		ctr = *ppctr;
+	}
+
 	/* lkclXXXX DO NOT ALIGN BEFORE READING SWITCH VALUE! */
 
 	if(!prs_uint16("switch_value", ps, depth, &ctr->switch_value))
@@ -4320,91 +5771,150 @@ static BOOL samr_io_userinfo_ctr(char *desc, SAM_USERINFO_CTR *ctr, prs_struct *
 	if(!prs_align(ps))
 		return False;
 
+	ret = False;
+
 	switch (ctr->switch_value) {
-		case 0x10:
-			if (UNMARSHALLING(ps)) /* reading */
-				ctr->info.id10 = (SAM_USER_INFO_10 *)malloc(sizeof(SAM_USER_INFO_10));
-			if (ctr->info.id10 == NULL) {
-				DEBUG(2, ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			if(!sam_io_user_info10("", ctr->info.id10, ps, depth))
-				return False;
-			break;
-		case 0x11:
-			if (UNMARSHALLING(ps)) /* reading */
-				ctr->info.id11 = (SAM_USER_INFO_11 *)malloc(sizeof(SAM_USER_INFO_11));
-			if (ctr->info.id11 == NULL) {
-				DEBUG(2, ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			if(!sam_io_user_info11("", ctr->info.id11, ps, depth))
-				return False;
-			break;
-		case 0x12:
-			if (UNMARSHALLING(ps)) /* reading */
-				ctr->info.id12 = (SAM_USER_INFO_12 *)malloc(sizeof(SAM_USER_INFO_12));
-			if (ctr->info.id12 == NULL) {
-				DEBUG(2, ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			if(!sam_io_user_info12("", ctr->info.id12, ps, depth))
-				return False;
-			break;
-		case 21:
-			if (UNMARSHALLING(ps)) /* reading */
-				ctr->info.id21 = (SAM_USER_INFO_21 *)malloc(sizeof(SAM_USER_INFO_21));
-			if (ctr->info.id21 == NULL) {
-				DEBUG(2, ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			if(!sam_io_user_info21("", ctr->info.id21, ps, depth))
-				return False;
-			break;
-		case 23:
-			if (UNMARSHALLING(ps)) /* reading */
-				ctr->info.id23 = (SAM_USER_INFO_23 *)malloc(sizeof(SAM_USER_INFO_23));
-			if (ctr->info.id23 == NULL) {
-				DEBUG(2, ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			if(!sam_io_user_info23("", ctr->info.id23, ps, depth))
-				return False;
-			break;
-		case 24:
-			if (UNMARSHALLING(ps)) /* reading */
-				ctr->info.id24 = (SAM_USER_INFO_24 *)malloc(sizeof(SAM_USER_INFO_24));
-			if (ctr->info.id24 == NULL) {
-				DEBUG(2, ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			if(!sam_io_user_info24("", ctr->info.id24, ps, depth))
-				return False;
-			break;
-		default:
-			DEBUG(2, ("samr_io_userinfo_ctr: unknown switch level 0x%x\n", ctr->switch_value));
+	case 0x10:
+		if (UNMARSHALLING(ps))
+			ctr->info.id10 = (SAM_USER_INFO_10 *)prs_alloc_mem(ps,sizeof(SAM_USER_INFO_10));
+		if (ctr->info.id10 == NULL) {
+			DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+			return False;
+		}
+		ret = sam_io_user_info10("", ctr->info.id10, ps, depth);
+		break;
+	case 0x11:
+		if (UNMARSHALLING(ps))
+			ctr->info.id11 = (SAM_USER_INFO_11 *)prs_alloc_mem(ps,sizeof(SAM_USER_INFO_11));
+
+		if (ctr->info.id11 == NULL) {
+			DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+			return False;
+		}
+		ret = sam_io_user_info11("", ctr->info.id11, ps, depth);
+		break;
+	case 0x12:
+		if (UNMARSHALLING(ps))
+			ctr->info.id12 = (SAM_USER_INFO_12 *)prs_alloc_mem(ps,sizeof(SAM_USER_INFO_12));
+
+		if (ctr->info.id12 == NULL) {
+			DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+			return False;
+		}
+		ret = sam_io_user_info12("", ctr->info.id12, ps, depth);
+		break;
+	case 21:
+		if (UNMARSHALLING(ps))
+			ctr->info.id21 = (SAM_USER_INFO_21 *)prs_alloc_mem(ps,sizeof(SAM_USER_INFO_21));
+
+		if (ctr->info.id21 == NULL) {
+			DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+			return False;
+		}
+		ret = sam_io_user_info21("", ctr->info.id21, ps, depth);
+		break;
+	case 23:
+		if (UNMARSHALLING(ps))
+			ctr->info.id23 = (SAM_USER_INFO_23 *)prs_alloc_mem(ps,sizeof(SAM_USER_INFO_23));
+
+		if (ctr->info.id23 == NULL) {
+			DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
 			return False;
+		}
+		ret = sam_io_user_info23("", ctr->info.id23, ps, depth);
+		break;
+	case 24:
+		if (UNMARSHALLING(ps))
+			ctr->info.id24 = (SAM_USER_INFO_24 *)prs_alloc_mem(ps,sizeof(SAM_USER_INFO_24));
+
+		if (ctr->info.id24 == NULL) {
+			DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+			return False;
+		}
+		ret = sam_io_user_info24("", ctr->info.id24, ps,  depth);
+		break;
+	default:
+		DEBUG(2, ("samr_io_userinfo_ctr: unknown switch level 0x%x\n", ctr->switch_value));
+		ret = False;
+		break;
+	}
+
+	return ret;
+}
+
+/*******************************************************************
+inits a SAMR_R_QUERY_USERINFO structure.
+********************************************************************/
+
+void init_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO * r_u,
+				SAM_USERINFO_CTR * ctr, uint32 status)
+{
+	DEBUG(5, ("init_samr_r_query_userinfo\n"));
+
+	r_u->ptr = 0;
+	r_u->ctr = NULL;
+
+	if (status == 0) {
+		r_u->ptr = 1;
+		r_u->ctr = ctr;
+	}
+
+	r_u->status = status;	/* return status */
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_query_userinfo(char *desc, SAMR_R_QUERY_USERINFO * r_u,
+			      prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
+		return False;
 
+	prs_debug(ps, depth, desc, "samr_io_r_query_userinfo");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
+		return False;
+
+	if (r_u->ptr != 0) {
+		if(!samr_io_userinfo_ctr("ctr", &r_u->ctr, ps, depth))
+			return False;
 	}
 
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
 	return True;
 }
 
 /*******************************************************************
-frees a structure.
+inits a SAMR_Q_SET_USERINFO structure.
 ********************************************************************/
-void free_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr)
+
+void init_samr_q_set_userinfo(SAMR_Q_SET_USERINFO * q_u,
+			      POLICY_HND *hnd,  unsigned char sess_key[16],
+			      uint16 switch_value, void *info)
 {
-	if (ctr == NULL)
-		return;
-	safe_free(ctr->info.id);
-	ctr->info.id = NULL;
+	DEBUG(5, ("init_samr_q_set_userinfo\n"));
+
+	q_u->pol = *hnd;
+	q_u->switch_value = switch_value;
+	init_samr_userinfo_ctr(q_u->ctr, sess_key, switch_value, info);
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO *q_u, prs_struct *ps, int depth)
+
+BOOL samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO * q_u,
+			    prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
@@ -4415,31 +5925,33 @@ BOOL samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO *q_u, prs_struct *ps
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth))
-		return False;
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 
 	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
 		return False;
-	if(!samr_io_userinfo_ctr("ctr", q_u->ctr, ps, depth))
+	if(!samr_io_userinfo_ctr("ctr", &q_u->ctr, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
-frees a structure.
+inits a SAMR_R_SET_USERINFO structure.
 ********************************************************************/
-void free_samr_q_set_userinfo(SAMR_Q_SET_USERINFO * q_u)
+
+void init_samr_r_set_userinfo(SAMR_R_SET_USERINFO * r_u, uint32 status)
 {
-       if (q_u == NULL)
-	       return;
-       free_samr_userinfo_ctr(q_u->ctr);
+	DEBUG(5, ("init_samr_r_set_userinfo\n"));
+
+	r_u->status = status;	/* return status */
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_set_userinfo(char *desc, SAMR_R_SET_USERINFO *r_u, prs_struct *ps, int depth)
+
+BOOL samr_io_r_set_userinfo(char *desc, SAMR_R_SET_USERINFO * r_u,
+			    prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
@@ -4457,9 +5969,39 @@ BOOL samr_io_r_set_userinfo(char *desc, SAMR_R_SET_USERINFO *r_u, prs_struct *ps
 }
 
 /*******************************************************************
+inits a SAMR_Q_SET_USERINFO2 structure.
+********************************************************************/
+
+void init_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u,
+			       POLICY_HND *hnd, unsigned char sess_key[16],
+			       uint16 switch_value, SAM_USERINFO_CTR * ctr)
+{
+	DEBUG(5, ("init_samr_q_set_userinfo2\n"));
+
+	q_u->pol = *hnd;
+	q_u->switch_value = switch_value;
+	q_u->ctr = ctr;
+
+	if (q_u->ctr != NULL)
+		q_u->ctr->switch_value = switch_value;
+
+	switch (switch_value) {
+	case 0x12:
+		SamOEMhash(ctr->info.id12->lm_pwd, sess_key, 0);
+		SamOEMhash(ctr->info.id12->nt_pwd, sess_key, 0);
+		dump_data(100, (char *)sess_key, 16);
+		dump_data(100, (char *)ctr->info.id12->lm_pwd, 16);
+		dump_data(100, (char *)ctr->info.id12->nt_pwd, 16);
+		break;
+	}
+}
+
+/*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_set_userinfo2(char *desc, SAMR_Q_SET_USERINFO2 *q_u, prs_struct *ps, int depth)
+
+BOOL samr_io_q_set_userinfo2(char *desc, SAMR_Q_SET_USERINFO2 * q_u,
+			     prs_struct *ps, int depth)
 {
 	if (q_u == NULL)
 		return False;
@@ -4475,31 +6017,89 @@ BOOL samr_io_q_set_userinfo2(char *desc, SAMR_Q_SET_USERINFO2 *q_u, prs_struct *
 
 	if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
 		return False;
-	if(!samr_io_userinfo_ctr("ctr", q_u->ctr, ps, depth))
+	if(!samr_io_userinfo_ctr("ctr", &q_u->ctr, ps, depth))
 		return False;
 
 	return True;
 }
 
 /*******************************************************************
-frees a structure.
+inits a SAMR_R_SET_USERINFO2 structure.
 ********************************************************************/
-void free_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 *q_u)
+
+void init_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 * r_u, uint32 status)
 {
-	free_samr_userinfo_ctr(q_u->ctr);
+	DEBUG(5, ("init_samr_r_set_userinfo2\n"));
+
+	r_u->status = status;	/* return status */
 }
 
 /*******************************************************************
-makes a SAMR_R_SET_USERINFO2 structure.
+reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 *r_u, uint32 status)
+
+BOOL samr_io_r_set_userinfo2(char *desc, SAMR_R_SET_USERINFO2 * r_u,
+			     prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
 
-	DEBUG(5, ("make_samr_r_set_userinfo2\n"));
+	prs_debug(ps, depth, desc, "samr_io_r_set_userinfo2");
+	depth++;
 
-	r_u->status = status;	/* return status */
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_Q_CONNECT structure.
+********************************************************************/
+
+void init_samr_q_connect(SAMR_Q_CONNECT * q_u,
+			 char *srv_name, uint32 access_mask)
+{
+	int len_srv_name = strlen(srv_name);
+
+	DEBUG(5, ("init_samr_q_connect\n"));
+
+	/* make PDC server name \\server */
+	q_u->ptr_srv_name = len_srv_name > 0 ? 1 : 0;
+	init_unistr2(&q_u->uni_srv_name, srv_name, len_srv_name + 1);
+
+	/* example values: 0x0000 0002 */
+	q_u->access_mask = access_mask;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_connect(char *desc, SAMR_Q_CONNECT * q_u,
+		       prs_struct *ps, int depth)
+{
+	if (q_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_connect");
+	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;
 
 	return True;
 }
@@ -4507,22 +6107,366 @@ BOOL make_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 *r_u, uint32 status)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_set_userinfo2(char *desc, SAMR_R_SET_USERINFO2 *r_u, prs_struct *ps, int depth)
+
+BOOL samr_io_r_connect(char *desc, SAMR_R_CONNECT * r_u,
+		       prs_struct *ps, int depth)
 {
 	if (r_u == NULL)
 		return False;
 
-	prs_debug(ps, depth, desc, "samr_io_r_set_userinfo2");
+	prs_debug(ps, depth, desc, "samr_io_r_connect");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
+		return False;
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_Q_CONNECT_ANON structure.
+********************************************************************/
+
+void init_samr_q_connect_anon(SAMR_Q_CONNECT_ANON * q_u)
+{
+	DEBUG(5, ("init_samr_q_connect_anon\n"));
+
+	q_u->ptr = 1;
+	q_u->unknown_0 = 0x5c;	/* server name (?!!) */
+	q_u->unknown_1 = 0x01;
+	q_u->access_mask = 0x20;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_connect_anon(char *desc, SAMR_Q_CONNECT_ANON * q_u,
+			    prs_struct *ps, int depth)
+{
+	if (q_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_connect_anon");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("ptr      ", ps, depth, &q_u->ptr))
+		return False;
+	if(!prs_uint16("unknown_0", ps, depth, &q_u->unknown_0))
+		return False;
+	if(!prs_uint16("unknown_1", ps, depth, &q_u->unknown_1))
+		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_connect_anon(char *desc, SAMR_R_CONNECT_ANON * r_u,
+			    prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_r_connect_anon");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
+		return False;
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+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)
+{
+	int len_srv_name = strlen(srv_name);
+
+	DEBUG(5, ("init_samr_q_get_dom_pwinfo\n"));
+
+	q_u->ptr = 1;
+	init_uni_hdr(&q_u->hdr_srv_name, len_srv_name);
+	init_unistr2(&q_u->uni_srv_name, srv_name, len_srv_name);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_get_dom_pwinfo(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(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("unk_0", ps, depth, &r_u->unk_0))
+		return False;
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint16("unk_1", ps, depth, &r_u->unk_1))
+		return False;
+	if(!prs_align(ps))
+		return False;
+	if(!prs_uint16("unk_2", ps, depth, &r_u->unk_2))
+		return False;
+	if(!prs_align(ps))
+		return False;
+
 	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
 }
 
+/*******************************************************************
+make a SAMR_ENC_PASSWD structure.
+********************************************************************/
+
+void init_enc_passwd(SAMR_ENC_PASSWD * pwd, char pass[512])
+{
+	ZERO_STRUCTP(pwd);
+
+	if (pass == NULL) {
+		pwd->ptr = 0;
+	} else {
+		pwd->ptr = 1;
+		memcpy(pwd->pass, pass, sizeof(pwd->pass));
+	}
+}
+
+/*******************************************************************
+reads or writes a SAMR_ENC_PASSWD structure.
+********************************************************************/
+
+BOOL samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD * pwd,
+			prs_struct *ps, int depth)
+{
+	if (pwd == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_enc_passwd");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("ptr", ps, depth, &pwd->ptr))
+		return False;
+
+	if (pwd->ptr != 0) {
+		if(!prs_uint8s(False, "pwd", ps, depth, pwd->pass, sizeof(pwd->pass)))
+			return False;
+	}
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_ENC_HASH structure.
+********************************************************************/
+
+void init_enc_hash(SAMR_ENC_HASH * hsh, uchar hash[16])
+{
+	ZERO_STRUCTP(hsh);
+
+	if (hash == NULL) {
+		hsh->ptr = 0;
+	} else {
+		hsh->ptr = 1;
+		memcpy(hsh->hash, hash, sizeof(hsh->hash));
+	}
+}
+
+/*******************************************************************
+reads or writes a SAMR_ENC_HASH structure.
+********************************************************************/
+
+BOOL samr_io_enc_hash(char *desc, SAMR_ENC_HASH * hsh,
+		      prs_struct *ps, int depth)
+{
+	if (hsh == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_enc_hash");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("ptr ", ps, depth, &hsh->ptr))
+		return False;
+	if (hsh->ptr != 0) {
+		if(!prs_uint8s(False, "hash", ps, depth, hsh->hash,sizeof(hsh->hash)))
+			return False;
+	}
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_GET_DOM_PWINFO structure.
+********************************************************************/
+
+void init_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER * q_u,
+				char *dest_host, char *user_name,
+				char nt_newpass[516],
+				uchar nt_oldhash[16],
+				char lm_newpass[516],
+				uchar lm_oldhash[16])
+{
+	int len_dest_host = strlen(dest_host);
+	int len_user_name = strlen(user_name);
+
+	DEBUG(5, ("init_samr_q_chgpasswd_user\n"));
+
+	q_u->ptr_0 = 1;
+	init_uni_hdr(&q_u->hdr_dest_host, len_dest_host);
+	init_unistr2(&q_u->uni_dest_host, dest_host, len_dest_host);
+	init_uni_hdr(&q_u->hdr_user_name, len_user_name);
+	init_unistr2(&q_u->uni_user_name, user_name, len_user_name);
+
+	init_enc_passwd(&q_u->nt_newpass, nt_newpass);
+	init_enc_hash(&q_u->nt_oldhash, nt_oldhash);
+
+	q_u->unknown = 0x01;
+
+	init_enc_passwd(&q_u->lm_newpass, lm_newpass);
+	init_enc_hash(&q_u->lm_oldhash, lm_oldhash);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER * q_u,
+			      prs_struct *ps, int depth)
+{
+	if (q_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_q_chgpasswd_user");
+	depth++;
+
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("ptr_0", ps, depth, &q_u->ptr_0))
+		return False;
+
+	if(!smb_io_unihdr("", &q_u->hdr_dest_host, ps, depth))
+		return False;
+	if(!smb_io_unistr2("", &q_u->uni_dest_host, q_u->hdr_dest_host.buffer, ps, depth))
+		return False;
+
+	if(!prs_align(ps))
+		return False;
+	if(!smb_io_unihdr("", &q_u->hdr_user_name, ps, depth))
+		return False;
+	if(!smb_io_unistr2("", &q_u->uni_user_name, q_u->hdr_user_name.buffer,ps, depth))
+		return False;
+
+	if(!samr_io_enc_passwd("nt_newpass", &q_u->nt_newpass, ps, depth))
+		return False;
+	if(!samr_io_enc_hash("nt_oldhash", &q_u->nt_oldhash, ps, depth))
+		return False;
+
+	if(!prs_uint32("unknown", ps, depth, &q_u->unknown))
+		return False;
+
+	if(!samr_io_enc_passwd("lm_newpass", &q_u->lm_newpass, ps, depth))
+		return False;
+	if(!samr_io_enc_hash("lm_oldhash", &q_u->lm_oldhash, ps, depth))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+inits a SAMR_R_CHGPASSWD_USER structure.
+********************************************************************/
+
+void init_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER * r_u, uint32 status)
+{
+	DEBUG(5, ("init_r_chgpasswd_user\n"));
+
+	r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER * r_u,
+			      prs_struct *ps, int depth)
+{
+	if (r_u == NULL)
+		return False;
+
+	prs_debug(ps, depth, desc, "samr_io_r_chgpasswd_user");
+	depth++;
 
-#undef OLD_NTDOMAIN 
+	if(!prs_align(ps))
+		return False;
+
+	if(!prs_uint32("status", ps, depth, &r_u->status))
+		return False;
+
+	return True;
+}