samr_lookup_names "none found" error needed corrections with empty lists.
[samba.git] / source3 / rpc_parse / parse_samr.c
index a72769d9c028488b26f80f0c98cf4cde89c72029..fb9392501133fc5f3854ea5e71b52a5def7657da 100644 (file)
@@ -2,9 +2,9 @@
  *  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-1998,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-1998,
+ *  Copyright (C) Paul Ashton                  1997-1998.
  *  
  *  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
@@ -78,18 +78,18 @@ void samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int
 reads or writes a structure.
 ********************************************************************/
 void make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
-                               POLICY_HND *connect_pol, uint32 rid, char *sid)
+                               POLICY_HND *connect_pol, uint32 flags,
+                               DOM_SID *sid)
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("samr_make_q_open_domain\n"));
+       DEBUG(5,("samr_make_samr_q_open_domain\n"));
 
        memcpy(&q_u->connect_pol, connect_pol, sizeof(q_u->connect_pol));
-       q_u->rid = rid;
+       q_u->flags = flags;
        make_dom_sid2(&(q_u->dom_sid), sid);
 }
 
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -105,7 +105,7 @@ void samr_io_q_open_domain(char *desc,  SAMR_Q_OPEN_DOMAIN *q_u, prs_struct *ps,
        smb_io_pol_hnd("connect_pol", &(q_u->connect_pol), ps, depth); 
        prs_align(ps);
 
-       prs_uint32("rid", ps, depth, &(q_u->rid));
+       prs_uint32("flags", ps, depth, &(q_u->flags));
 
        smb_io_dom_sid2("sid", &(q_u->dom_sid), ps, depth); 
        prs_align(ps);
@@ -130,39 +130,65 @@ void samr_io_r_open_domain(char *desc,  SAMR_R_OPEN_DOMAIN *r_u, prs_struct *ps,
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void make_samr_q_unknown_8(SAMR_Q_UNKNOWN_8 *q_u,
-                               POLICY_HND *domain_pol, uint16 switch_value)
+void make_samr_q_unknown_2c(SAMR_Q_UNKNOWN_2C *q_u, POLICY_HND *user_pol)
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("samr_make_q_unknown_8\n"));
+       DEBUG(5,("samr_make_samr_q_unknown_2c\n"));
 
-       memcpy(&q_u->domain_pol, domain_pol, sizeof(q_u->domain_pol));
-       q_u->switch_value = switch_value;
+       memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
 }
 
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_unknown_8(char *desc,  SAMR_Q_UNKNOWN_8 *q_u, prs_struct *ps, int depth)
+void samr_io_q_unknown_2c(char *desc,  SAMR_Q_UNKNOWN_2C *q_u, prs_struct *ps, int depth)
 {
        if (q_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_unknown_8");
+       prs_debug(ps, depth, desc, "samr_io_q_unknown_2c");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+       smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth); 
        prs_align(ps);
+}
+
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_samr_r_unknown_2c(SAMR_R_UNKNOWN_2C *q_u, uint32 status)
+{
+       if (q_u == NULL) return;
+
+       DEBUG(5,("samr_make_r_unknown_2c\n"));
+
+       q_u->unknown_0 = 0x00160000;
+       q_u->unknown_1 = 0x00000000;
+       q_u->status    = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_unknown_2c(char *desc,  SAMR_R_UNKNOWN_2C *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_unknown_2c");
+       depth++;
 
-       prs_uint16("switch_value", ps, depth, &(q_u->switch_value));
        prs_align(ps);
+
+       prs_uint32("unknown_0", ps, depth, &(r_u->unknown_0));
+       prs_uint32("unknown_1", ps, depth, &(r_u->unknown_1));
+       prs_uint32("status   ", ps, depth, &(r_u->status   ));
 }
 
 /*******************************************************************
@@ -173,7 +199,7 @@ void make_samr_q_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("samr_make_q_unknown_3\n"));
+       DEBUG(5,("samr_make_samr_q_unknown_3\n"));
 
        memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
        q_u->switch_value = switch_value;
@@ -199,16 +225,248 @@ void samr_io_q_unknown_3(char *desc,  SAMR_Q_UNKNOWN_3 *q_u, prs_struct *ps, int
        prs_align(ps);
 }
 
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void make_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
+                               POLICY_HND *domain_pol, uint16 switch_value)
+{
+       if (q_u == NULL) return;
+
+       DEBUG(5,("samr_make_samr_q_query_dom_info\n"));
+
+       memcpy(&q_u->domain_pol, domain_pol, sizeof(q_u->domain_pol));
+       q_u->switch_value = switch_value;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void 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;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_dom_info");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint16("switch_value", ps, depth, &(q_u->switch_value));
+       prs_align(ps);
+}
+
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_unk_info6(SAM_UNK_INFO_6 *u_6)
+{
+       if (u_6 == NULL) return;
+
+       u_6->unknown_0 = 0x00000000;
+       u_6->ptr_0 = 1;
+       memset(u_6->padding, 0, sizeof(u_6->padding)); /* 12 bytes zeros */
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 *u_6, prs_struct *ps, int depth)
+{
+       if (u_6 == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_unk_info6");
+       depth++;
+
+       prs_uint32("unknown_0", ps, depth, &u_6->unknown_0); /* 0x0000 0000 */
+       prs_uint32("ptr_0", ps, depth, &u_6->ptr_0);     /* pointer to unknown structure */
+       prs_uint8s(False, "padding", ps, depth, u_6->padding, sizeof(u_6->padding)); /* 12 bytes zeros */
+
+       prs_align(ps);
+
+}
+
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_unk_info7(SAM_UNK_INFO_7 *u_7)
+{
+       if (u_7 == NULL) return;
+
+       u_7->unknown_0 = 0x0003;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 *u_7, prs_struct *ps, int depth)
+{
+       if (u_7 == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_unk_info7");
+       depth++;
+
+       prs_uint16("unknown_0", ps, depth, &u_7->unknown_0); /* 0x0003 */
+       prs_align(ps);
+
+}
+
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
+{
+       int len_domain = strlen(domain);
+       int len_server = strlen(server);
+
+       if (u_2 == NULL) return;
+
+       u_2->unknown_0 = 0x00000000;
+       u_2->unknown_1 = 0x80000000;
+       u_2->unknown_2 = 0x00000000;
+
+       u_2->ptr_0 = 1;
+       make_uni_hdr(&(u_2->hdr_domain), len_domain, len_domain, 1);
+       make_uni_hdr(&(u_2->hdr_server), len_server, len_server, 1);
+
+       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 */
+
+       make_unistr2(&u_2->uni_domain, domain, len_domain);
+       make_unistr2(&u_2->uni_server, server, len_server);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 *u_2, prs_struct *ps, int depth)
+{
+       if (u_2 == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_unk_info2");
+       depth++;
+
+       prs_uint32("unknown_0", ps, depth, &u_2->unknown_0); /* 0x0000 0000 */
+       prs_uint32("unknown_1", ps, depth, &u_2->unknown_1); /* 0x8000 0000 */
+       prs_uint32("unknown_2", ps, depth, &u_2->unknown_2); /* 0x0000 0000 */
+
+       prs_uint32("ptr_0", ps, depth, &u_2->ptr_0);     /* pointer to unknown structure */
+       smb_io_unihdr("hdr_domain", &u_2->hdr_domain, ps, depth); /* domain name unicode header */
+       smb_io_unihdr("hdr_server", &u_2->hdr_server, ps, depth); /* server name unicode header */
+
+       /* put all the data in here, at the moment, including what the above
+          pointer is referring to
+        */
+
+       prs_uint32("seq_num ", ps, depth, &u_2->seq_num ); /* 0x0000 0099 or 0x1000 0000 */
+       prs_uint32("unknown_3 ", ps, depth, &u_2->unknown_3 ); /* 0x0000 0000 */
+       
+       prs_uint32("unknown_4 ", ps, depth, &u_2->unknown_4 ); /* 0x0000 0001 */
+       prs_uint32("unknown_5 ", ps, depth, &u_2->unknown_5 ); /* 0x0000 0003 */
+       prs_uint32("unknown_6 ", ps, depth, &u_2->unknown_6 ); /* 0x0000 0001 */
+       prs_uint32("num_domain_usrs ", ps, depth, &u_2->num_domain_usrs ); /* 0x0000 0008 */
+       prs_uint32("num_domain_grps", ps, depth, &u_2->num_domain_grps); /* 0x0000 0003 */
+       prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps); /* 0x0000 0003 */
+
+       prs_uint8s(False, "padding", ps, depth, u_2->padding, sizeof(u_2->padding)); /* 12 bytes zeros */
+
+       smb_io_unistr2( "uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer, ps, depth); /* domain name unicode string */
+       smb_io_unistr2( "uni_server", &u_2->uni_server, u_2->hdr_server.buffer, ps, depth); /* server name unicode string */
+
+       prs_align(ps);
+
+}
+
+/*******************************************************************
+makes a SAMR_R_QUERY_DOMAIN_INFO structure.
+********************************************************************/
+void make_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO *r_u, 
+                               uint16 switch_value, SAM_UNK_CTR *ctr,
+                               uint32 status)
+{
+       if (r_u == NULL || ctr == NULL) return;
+
+       DEBUG(5,("make_samr_r_query_dom_info\n"));
+
+       r_u->ptr_0 = 0;
+       r_u->switch_value = 0;
+       r_u->status = status; /* return status */
+
+       if (status == 0)
+       {
+               r_u->switch_value = switch_value;
+               r_u->ptr_0 = 1;
+               r_u->ctr = ctr;
+       }
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_dom_info");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr_0       ", ps, depth, &(r_u->ptr_0));
+       prs_uint16("switch_value", ps, depth, &(r_u->switch_value));
+       prs_align(ps);
+
+       if (r_u->ptr_0 != 0 && r_u->ctr != NULL)
+       {
+               switch (r_u->switch_value)
+               {
+                       case 0x06:
+                       {
+                               sam_io_unk_info6("unk_inf6", &r_u->ctr->info.inf6, ps, depth);
+                               break;
+                       }
+                       case 0x07:
+                       {
+                               sam_io_unk_info7("unk_inf7", &r_u->ctr->info.inf7, ps, depth);
+                               break;
+                       }
+                       case 0x02:
+                       {
+                               sam_io_unk_info2("unk_inf2", &r_u->ctr->info.inf2, ps, depth);
+                               break;
+                       }
+                       default:
+                       {
+                               DEBUG(3,("samr_io_r_query_dom_info: unknown switch level 0x%x\n",
+                                         r_u->switch_value));
+                               return;
+                       }
+               }
+       }
+}
+
+
 /*******************************************************************
  makes a DOM_SID3 structure.
 
  calculate length by adding up the size of the components.
  ********************************************************************/
-void make_dom_sid3(DOM_SID3 *sid3, uint16 unk_0, uint16 unk_1, char *sid)
+void make_dom_sid3(DOM_SID3 *sid3, uint16 unk_0, uint16 unk_1, DOM_SID *sid)
 {
        if (sid3 == NULL) return;
 
-       make_dom_sid(&(sid3->sid), sid);
+    sid3->sid = *sid;
        sid3->len = 2 + 8 + sid3->sid.num_auths * 4;
 }
 
@@ -219,7 +477,7 @@ this one's odd, because the length (in bytes) is specified at the beginning.
 the length _includes_ the length of the length, too :-)
 
 ********************************************************************/
-void sam_io_dom_sid3(char *desc,  DOM_SID3 *sid3, prs_struct *ps, int depth)
+static void sam_io_dom_sid3(char *desc,  DOM_SID3 *sid3, prs_struct *ps, int depth)
 {
        if (sid3 == NULL) return;
 
@@ -243,7 +501,7 @@ unknown_6   : 0x0002
 unknown_7   : 0x5800 or 0x0070
 
 ********************************************************************/
-void make_sam_sid_stuff(SAM_SID_STUFF *stf,
+static void make_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])
@@ -269,7 +527,7 @@ void make_sam_sid_stuff(SAM_SID_STUFF *stf,
 /*******************************************************************
 reads or writes a SAM_SID_STUFF structure.
 ********************************************************************/
-void sam_io_sid_stuff(char *desc,  SAM_SID_STUFF *stf, prs_struct *ps, int depth)
+static void sam_io_sid_stuff(char *desc,  SAM_SID_STUFF *stf, prs_struct *ps, int depth)
 {
        int i;
 
@@ -290,6 +548,8 @@ void sam_io_sid_stuff(char *desc,  SAM_SID_STUFF *stf, prs_struct *ps, int depth
        prs_uint32("num_sids ", ps, depth, &(stf->num_sids ));
        prs_uint16("padding2 ", ps, depth, &(stf->padding2 ));
 
+       SMB_ASSERT_ARRAY(stf->sid, stf->num_sids);
+
        for (i = 0; i < stf->num_sids; i++)
        {
                sam_io_dom_sid3("", &(stf->sid[i]), ps, depth); 
@@ -339,8 +599,8 @@ wierd.
 ********************************************************************/
 void samr_io_r_unknown_3(char *desc,  SAMR_R_UNKNOWN_3 *r_u, prs_struct *ps, int depth)
 {
-       int ptr_len0;
-       int ptr_len1;
+       int ptr_len0=0;
+       int ptr_len1=0;
        int ptr_sid_stuff = 0;
 
        if (r_u == NULL) return;
@@ -404,29 +664,10 @@ void samr_io_r_unknown_3(char *desc,  SAMR_R_UNKNOWN_3 *r_u, prs_struct *ps, int
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
-
-/*******************************************************************
-makes a SAM_STR1 structure.
-********************************************************************/
-void make_sam_str1(SAM_STR1 *sam, char *sam_acct, char *sam_name, char *sam_desc)
-{
-       int len_sam_acct = sam_acct != NULL ? strlen(sam_acct) : 0;
-       int len_sam_name = sam_name != NULL ? strlen(sam_name) : 0;
-       int len_sam_desc = sam_desc != NULL ? strlen(sam_desc) : 0;
-
-       if (sam == NULL) return;
-
-       DEBUG(5,("make_sam_str1: %d\n", __LINE__));
-
-       make_unistr2(&(sam->uni_acct_name), sam_acct, len_sam_acct);
-       make_unistr2(&(sam->uni_full_name), sam_name, len_sam_name);
-       make_unistr2(&(sam->uni_acct_desc), sam_desc, len_sam_desc);
-}
-
 /*******************************************************************
 reads or writes a SAM_STR1 structure.
 ********************************************************************/
-void sam_io_sam_str1(char *desc,  SAM_STR1 *sam, uint32 acct_buf, uint32 name_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static void 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;
 
@@ -443,13 +684,13 @@ void sam_io_sam_str1(char *desc,  SAM_STR1 *sam, uint32 acct_buf, uint32 name_bu
 /*******************************************************************
 makes a SAM_ENTRY1 structure.
 ********************************************************************/
-void make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx, 
+static void make_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)
 {
        if (sam == NULL) return;
 
-       DEBUG(5,("make_sam_entry2: %d\n", __LINE__));
+       DEBUG(5,("make_sam_entry1\n"));
 
        sam->user_idx = user_idx;
        sam->rid_user = rid_user;
@@ -464,11 +705,11 @@ void make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY1 structure.
 ********************************************************************/
-void sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int depth)
 {
        if (sam == NULL) return;
 
-       prs_debug(ps, depth, desc, "sam_io_sam_entry2");
+       prs_debug(ps, depth, desc, "sam_io_sam_entry1");
        depth++;
 
        prs_align(ps);
@@ -484,26 +725,10 @@ void sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int depth)
        smb_io_unihdr("unihdr", &(sam->hdr_user_desc), ps, depth); /* account name unicode string header */
 }
 
-/*******************************************************************
-makes a SAM_STR2 structure.
-********************************************************************/
-void make_sam_str2(SAM_STR2 *sam, char *sam_acct, char *sam_desc)
-{
-       int len_sam_acct = sam_acct != NULL ? strlen(sam_acct) : 0;
-       int len_sam_desc = sam_desc != NULL ? strlen(sam_desc) : 0;
-
-       if (sam == NULL) return;
-
-       DEBUG(5,("make_sam_str2: %d\n", __LINE__));
-
-       make_unistr2(&(sam->uni_srv_name), sam_acct, len_sam_acct);
-       make_unistr2(&(sam->uni_srv_desc), sam_desc, len_sam_desc);
-}
-
 /*******************************************************************
 reads or writes a SAM_STR2 structure.
 ********************************************************************/
-void sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static void sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
 {
        if (sam == NULL) return;
 
@@ -519,13 +744,13 @@ void sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32 desc_bu
 /*******************************************************************
 makes a SAM_ENTRY2 structure.
 ********************************************************************/
-void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx, 
+static void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx, 
                                uint32 len_sam_name, uint32 len_sam_desc,
                                uint32 rid_user, uint16 acb_info)
 {
        if (sam == NULL) return;
 
-       DEBUG(5,("make_sam_entry2: %d\n", __LINE__));
+       DEBUG(5,("make_sam_entry2\n"));
 
        sam->user_idx = user_idx;
        sam->rid_user = rid_user;
@@ -539,7 +764,7 @@ void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY2 structure.
 ********************************************************************/
-void sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int depth)
 {
        if (sam == NULL) return;
 
@@ -558,26 +783,10 @@ void sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int depth)
        smb_io_unihdr("unihdr", &(sam->hdr_srv_desc), ps, depth); /* account name unicode string header */
 }
 
-/*******************************************************************
-makes a SAM_STR3 structure.
-********************************************************************/
-void make_sam_str3(SAM_STR3 *sam, char *grp_acct, char *grp_desc)
-{
-       int len_grp_acct = strlen(grp_acct);
-       int len_grp_desc = strlen(grp_desc);
-
-       if (sam == NULL) return;
-
-       DEBUG(5,("make_sam_str3: %d\n", __LINE__));
-
-       make_unistr2(&(sam->uni_grp_name), grp_acct, len_grp_acct);
-       make_unistr2(&(sam->uni_grp_desc), grp_desc, len_grp_desc);
-}
-
 /*******************************************************************
 reads or writes a SAM_STR3 structure.
 ********************************************************************/
-void sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static void sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
 {
        if (sam == NULL) return;
 
@@ -593,12 +802,12 @@ void sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32 desc_bu
 /*******************************************************************
 makes a SAM_ENTRY3 structure.
 ********************************************************************/
-void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx, 
+static void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx, 
                                uint32 len_grp_name, uint32 len_grp_desc, uint32 rid_grp)
 {
        if (sam == NULL) return;
 
-       DEBUG(5,("make_sam_entry3: %d\n", __LINE__));
+       DEBUG(5,("make_sam_entry3\n"));
 
        sam->grp_idx = grp_idx;
        sam->rid_grp = rid_grp;
@@ -611,7 +820,7 @@ void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY3 structure.
 ********************************************************************/
-void sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int depth)
 {
        if (sam == NULL) return;
 
@@ -632,11 +841,11 @@ void sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int depth)
 /*******************************************************************
 makes a SAM_ENTRY structure.
 ********************************************************************/
-void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
+static void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
 {
        if (sam == NULL) return;
 
-       DEBUG(5,("make_sam_entry: %d\n", __LINE__));
+       DEBUG(5,("make_sam_entry\n"));
 
        sam->rid = rid;
        make_uni_hdr(&(sam->hdr_name), len_sam_name, len_sam_name, len_sam_name != 0);
@@ -645,7 +854,7 @@ void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
 /*******************************************************************
 reads or writes a SAM_ENTRY structure.
 ********************************************************************/
-void sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int depth)
 {
        if (sam == NULL) return;
 
@@ -657,27 +866,26 @@ void sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int depth)
        smb_io_unihdr("unihdr", &(sam->hdr_name), ps, depth); /* account name unicode string header */
 }
 
+
 /*******************************************************************
 makes a SAMR_Q_ENUM_DOM_USERS structure.
 ********************************************************************/
 void make_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_e, POLICY_HND *pol,
-                               uint16 req_num_entries, uint16 unk_0,
+                               uint32 start_idx, 
                                uint16 acb_mask, uint16 unk_1, uint32 size)
 {
        if (q_e == NULL || pol == NULL) return;
 
-       DEBUG(5,("make_q_enum_dom_users\n"));
+       DEBUG(5,("make_samr_q_enum_dom_users\n"));
 
        memcpy(&(q_e->pol), pol, sizeof(*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->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.
 ********************************************************************/
@@ -693,13 +901,11 @@ void samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc
        smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
        prs_align(ps);
 
-       prs_uint16("req_num_entries", ps, depth, &(q_e->req_num_entries));
-       prs_uint16("unknown_0      ", ps, depth, &(q_e->unknown_0      ));
-
-       prs_uint16("acb_mask       ", ps, depth, &(q_e->acb_mask       ));
-       prs_uint16("unknown_1      ", ps, depth, &(q_e->unknown_1      ));
+       prs_uint32("start_idx", ps, depth, &(q_e->start_idx));
+       prs_uint16("acb_mask ", ps, depth, &(q_e->acb_mask ));
+       prs_uint16("unknown_1", ps, depth, &(q_e->unknown_1));
 
-       prs_uint32("max_size       ", ps, depth, &(q_e->max_size       ));
+       prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
 
        prs_align(ps);
 }
@@ -709,7 +915,7 @@ void samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc
 makes a SAMR_R_ENUM_DOM_USERS structure.
 ********************************************************************/
 void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
-               uint16 total_num_entries, uint16 unk_0,
+               uint32 next_idx,
                uint32 num_sam_entries, SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES], uint32 status)
 {
        int i;
@@ -721,19 +927,22 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
        if (num_sam_entries >= MAX_SAM_ENTRIES)
        {
                num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+               DEBUG(5,("limiting number of entries to %d\n",
+                        num_sam_entries));
        }
 
-       r_u->total_num_entries = total_num_entries;
-       r_u->unknown_0         = unk_0;
+       r_u->next_idx = next_idx;
 
-       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++)
                {
                        make_sam_entry(&(r_u->sam[i]),
@@ -769,22 +978,25 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 
        prs_align(ps);
 
-       prs_uint16("total_num_entries", ps, depth, &(r_u->total_num_entries));
-       prs_uint16("unknown_0        ", ps, depth, &(r_u->unknown_0        ));
+       prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx    ));
        prs_uint32("ptr_entries1", ps, depth, &(r_u->ptr_entries1));
 
-       if (r_u->total_num_entries != 0 && r_u->ptr_entries1 != 0)
+       if (r_u->ptr_entries1 != 0)
        {
                prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
                prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2));
                prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
 
+               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries2);
+
                for (i = 0; i < r_u->num_entries2; i++)
                {
                        prs_grow(ps);
                        sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
                }
 
+               SMB_ASSERT_ARRAY(r_u->uni_acct_name, r_u->num_entries2);
+
                for (i = 0; i < r_u->num_entries2; i++)
                {
                        prs_grow(ps);
@@ -800,29 +1012,33 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 }
 
 /*******************************************************************
-makes a SAMR_Q_ENUM_DOM_ALIASES structure.
+makes a SAMR_Q_QUERY_DISPINFO structure.
 ********************************************************************/
-void make_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_e, POLICY_HND *pol, uint32 size)
+void make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
+                               uint16 switch_level, uint32 start_idx, uint32 size)
 {
        if (q_e == NULL || pol == NULL) return;
 
-       DEBUG(5,("make_q_enum_dom_aliases\n"));
+       DEBUG(5,("make_samr_q_query_dispinfo\n"));
 
        memcpy(&(q_e->pol), pol, sizeof(*pol));
 
+       q_e->switch_level = switch_level;
+
        q_e->unknown_0 = 0;
-       q_e->max_size = size;
+       q_e->start_idx = start_idx;
+       q_e->unknown_1 = 0x000007d0;
+       q_e->max_size  = size;
 }
 
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_enum_dom_aliases(char *desc,  SAMR_Q_ENUM_DOM_ALIASES *q_e, prs_struct *ps, int depth)
+void samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struct *ps, int depth)
 {
        if (q_e == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_enum_dom_aliases");
+       prs_debug(ps, depth, desc, "samr_io_q_query_dispinfo");
        depth++;
 
        prs_align(ps);
@@ -830,170 +1046,40 @@ void samr_io_q_enum_dom_aliases(char *desc,  SAMR_Q_ENUM_DOM_ALIASES *q_e, prs_s
        smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
        prs_align(ps);
 
-       prs_uint32("unknown_0", ps, depth, &(q_e->unknown_0));
-       prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
+       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
+       prs_uint16("unknown_0   ", ps, depth, &(q_e->unknown_0   ));
+       prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
+       prs_uint32("unknown_1   ", ps, depth, &(q_e->unknown_1   ));
+       prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
 
        prs_align(ps);
 }
 
 
 /*******************************************************************
-makes a SAMR_R_ENUM_DOM_ALIASES structure.
+makes a SAM_INFO_2 structure.
 ********************************************************************/
-void make_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 make_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])
 {
        int i;
+       int entries_added;
 
-       if (r_u == NULL) return;
+       if (sam == NULL) return;
 
-       DEBUG(5,("make_samr_r_enum_dom_aliases\n"));
+       DEBUG(5,("make_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 %s\n", num_sam_entries));
+               DEBUG(5,("limiting number of entries to %d\n", 
+                        num_sam_entries));
        }
 
-       r_u->num_entries  = num_sam_entries;
-
-       if (num_sam_entries > 0)
+       for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
        {
-               r_u->ptr_entries  = 1;
-               r_u->num_entries2 = num_sam_entries;
-               r_u->ptr_entries2 = 1;
-               r_u->num_entries3 = num_sam_entries;
-
-               for (i = 0; i < num_sam_entries; i++)
-               {
-                       make_sam_entry(&(r_u->sam[i]),
-                                      grps[i].uni_user_name.uni_str_len,
-                                      grps[i].user_rid);
-
-                       copy_unistr2(&(r_u->uni_grp_name[i]), &(grps[i].uni_user_name));
-               }
-
-               r_u->num_entries4 = num_sam_entries;
-       }
-       else
-       {
-               r_u->ptr_entries = 0;
-       }
-
-       r_u->status = status;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_struct *ps, int depth)
-{
-       int i;
-
-       if (r_u == NULL) return;
-
-       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases");
-       depth++;
-
-       prs_align(ps);
-
-       prs_uint32("num_entries", ps, depth, &(r_u->num_entries));
-       prs_uint32("ptr_entries", ps, depth, &(r_u->ptr_entries));
-
-       if (r_u->num_entries != 0 && r_u->ptr_entries != 0)
-       {
-               prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
-               prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2));
-               prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
-
-               for (i = 0; i < r_u->num_entries; i++)
-               {
-                       sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
-               }
-
-               for (i = 0; i < r_u->num_entries; i++)
-               {
-                       smb_io_unistr2("", &(r_u->uni_grp_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth);
-               }
-
-               prs_align(ps);
-
-               prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
-       }
-
-       prs_uint32("status", ps, depth, &(r_u->status));
-}
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_DISPINFO structure.
-********************************************************************/
-void make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
-                               uint16 switch_level, uint32 start_idx, uint32 size)
-{
-       if (q_e == NULL || pol == NULL) return;
-
-       DEBUG(5,("make_q_query_dispinfo\n"));
-
-       memcpy(&(q_e->pol), pol, sizeof(*pol));
-
-       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;
-}
-
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struct *ps, int depth)
-{
-       if (q_e == NULL) return;
-
-       prs_debug(ps, depth, desc, "samr_io_q_query_dispinfo");
-       depth++;
-
-       prs_align(ps);
-
-       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
-       prs_align(ps);
-
-       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
-       prs_uint16("unknown_0   ", ps, depth, &(q_e->unknown_0   ));
-       prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
-       prs_uint32("unknown_1   ", ps, depth, &(q_e->unknown_1   ));
-       prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
-
-       prs_align(ps);
-}
-
-
-/*******************************************************************
-makes a SAM_INFO_2 structure.
-********************************************************************/
-void make_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])
-{
-       int i;
-       int entries_added;
-
-       if (sam == NULL) return;
-
-       DEBUG(5,("make_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 %s\n", num_sam_entries));
-       }
-
-       for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
-       {
-               if (IS_BITS_SET_ALL(pass[i].acb_info, acb_mask))
+               if (IS_BITS_SET_ALL(pass[i].acb_info, acb_mask))
                {
                        make_sam_entry2(&(sam->sam[entries_added]),
                                        start_idx + entries_added + 1,
@@ -1017,7 +1103,7 @@ void make_sam_info_2(SAM_INFO_2 *sam, uint32 acb_mask,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void sam_io_sam_info_2(char *desc,  SAM_INFO_2 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_info_2(char *desc,  SAM_INFO_2 *sam, prs_struct *ps, int depth)
 {
        int i;
 
@@ -1033,13 +1119,17 @@ void sam_io_sam_info_2(char *desc,  SAM_INFO_2 *sam, prs_struct *ps, int depth)
 
        prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 ));
 
+       SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+
        for (i = 0; i < sam->num_entries; i++)
        {
+               prs_grow(ps);
                sam_io_sam_entry2("", &(sam->sam[i]), ps, depth);
        }
 
        for (i = 0; i < sam->num_entries; i++)
        {
+               prs_grow(ps);
                sam_io_sam_str2 ("", &(sam->str[i]),
                                                         sam->sam[i].hdr_srv_name.buffer,
                                                         sam->sam[i].hdr_srv_desc.buffer,
@@ -1065,7 +1155,8 @@ void make_sam_info_1(SAM_INFO_1 *sam, uint32 acb_mask,
        if (num_sam_entries >= MAX_SAM_ENTRIES)
        {
                num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+               DEBUG(5,("limiting number of entries to %d\n", 
+                        num_sam_entries));
        }
 
        for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
@@ -1097,7 +1188,7 @@ void make_sam_info_1(SAM_INFO_1 *sam, uint32 acb_mask,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void sam_io_sam_info_1(char *desc,  SAM_INFO_1 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_info_1(char *desc,  SAM_INFO_1 *sam, prs_struct *ps, int depth)
 {
        int i;
 
@@ -1113,13 +1204,17 @@ void sam_io_sam_info_1(char *desc,  SAM_INFO_1 *sam, prs_struct *ps, int depth)
 
        prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 ));
 
+       SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+
        for (i = 0; i < sam->num_entries; i++)
        {
+               prs_grow(ps);
                sam_io_sam_entry1("", &(sam->sam[i]), ps, depth);
        }
 
        for (i = 0; i < sam->num_entries; i++)
        {
+               prs_grow(ps);
                sam_io_sam_str1 ("", &(sam->str[i]),
                                                         sam->sam[i].hdr_acct_name.buffer,
                                                         sam->sam[i].hdr_user_name.buffer,
@@ -1137,7 +1232,7 @@ void make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
 {
        if (r_u == NULL) return;
 
-       DEBUG(5,("make_samr_r_query_dispinfo\n"));
+       DEBUG(5,("make_samr_r_query_dispinfo: level %d\n", switch_level));
 
        if (status == 0x0)
        {
@@ -1198,229 +1293,1699 @@ void samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, prs_struc
 
 
 /*******************************************************************
-makes a SAMR_Q_ENUM_DOM_GROUPS structure.
+makes a SAMR_Q_OPEN_GROUP structure.
 ********************************************************************/
-void make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e, POLICY_HND *pol,
-                               uint16 switch_level, uint32 start_idx, uint32 size)
+void make_samr_q_open_group(SAMR_Q_OPEN_GROUP *q_c,
+                               POLICY_HND *hnd, uint32 unk, uint32 rid)
 {
-       if (q_e == NULL || pol == NULL) return;
+       if (q_c == NULL || hnd == NULL) return;
 
-       DEBUG(5,("make_q_enum_dom_groups\n"));
+       DEBUG(5,("make_samr_q_open_group\n"));
 
-       memcpy(&(q_e->pol), pol, sizeof(*pol));
+       memcpy(&(q_c->domain_pol), hnd, sizeof(q_c->domain_pol));
+       q_c->unknown = unk;
+       q_c->rid_group = rid;
+}
 
-       q_e->switch_level = switch_level;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_open_group(char *desc,  SAMR_Q_OPEN_GROUP *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
 
-       q_e->unknown_0 = 0;
-       q_e->start_idx = start_idx;
-       q_e->unknown_1 = 0x000007d0;
-       q_e->max_size  = size;
-}
+       prs_debug(ps, depth, desc, "samr_io_q_open_group");
+       depth++;
+
+       prs_align(ps);
 
+       smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+
+       prs_uint32("unknown  ", ps, depth, &(q_u->unknown  ));
+       prs_uint32("rid_group", ps, depth, &(q_u->rid_group));
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_enum_dom_groups(char *desc,  SAMR_Q_ENUM_DOM_GROUPS *q_e, prs_struct *ps, int depth)
+void samr_io_r_open_group(char *desc,  SAMR_R_OPEN_GROUP *r_u, prs_struct *ps, int depth)
 {
-       if (q_e == NULL) return;
+       if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
+       prs_debug(ps, depth, desc, "samr_io_r_open_group");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
        prs_align(ps);
 
-       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
-       prs_uint16("unknown_0   ", ps, depth, &(q_e->unknown_0   ));
-       prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
-       prs_uint32("unknown_1   ", ps, depth, &(q_e->unknown_1   ));
-       prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
-
-       prs_align(ps);
+       prs_uint32("status", ps, depth, &(r_u->status));
 }
 
 
 /*******************************************************************
-makes a SAMR_R_ENUM_DOM_GROUPS structure.
+makes a GROUP_INFO1 structure.
 ********************************************************************/
-void make_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 make_samr_group_info1(GROUP_INFO1 *gr1,
+                               char *acct_name, char *acct_desc)
 {
-       int i;
-       int entries_added;
-
-       if (r_u == NULL) return;
-
-       DEBUG(5,("make_samr_r_enum_dom_groups\n"));
-
-       if (num_sam_entries >= MAX_SAM_ENTRIES)
-       {
-               num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
-       }
+       int desc_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       int acct_len = acct_name != NULL ? strlen(acct_name) : 0;
+       if (gr1 == NULL) return;
 
-       if (status == 0x0)
-       {
-               for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
-               {
-                       make_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);
+       DEBUG(5,("make_samr_group_info1\n"));
 
-                       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));
+       make_uni_hdr(&(gr1->hdr_acct_name), acct_len , acct_len, acct_name ? 1 : 0);
 
-                       entries_added++;
-               }
+       gr1->unknown_1 = 0x3;
+       gr1->unknown_2 = 0x3;
 
-               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;
-       }
+       make_uni_hdr(&(gr1->hdr_acct_desc), desc_len , desc_len, acct_desc ? 1 : 0);
 
-       r_u->status = status;
+       make_unistr2(&(gr1->uni_acct_name), acct_name, acct_len);
+       make_unistr2(&(gr1->uni_acct_desc), acct_desc, desc_len);
 }
 
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_enum_dom_groups(char *desc,  SAMR_R_ENUM_DOM_GROUPS *r_u, prs_struct *ps, int depth)
+void samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int depth)
 {
-       int i;
-
-       if (r_u == NULL) return;
+       if (gr1 == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
+       prs_debug(ps, depth, desc, "samr_io_group_info1");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("unknown_0    ", ps, depth, &(r_u->unknown_0    ));
-       prs_uint32("unknown_1    ", ps, depth, &(r_u->unknown_1    ));
-       prs_uint32("switch_level ", ps, depth, &(r_u->switch_level ));
-
-       if (r_u->switch_level != 0)
-       {
-               prs_uint32("num_entries  ", ps, depth, &(r_u->num_entries  ));
-               prs_uint32("ptr_entries  ", ps, depth, &(r_u->ptr_entries  ));
+       smb_io_unihdr ("hdr_acct_name", &(gr1->hdr_acct_name) , ps, depth); 
 
-               prs_uint32("num_entries2 ", ps, depth, &(r_u->num_entries2 ));
+       prs_uint32("unknown_1", ps, depth, &(gr1->unknown_1));
+       prs_uint32("unknown_2", ps, depth, &(gr1->unknown_2));
 
-               for (i = 0; i < r_u->num_entries; i++)
-               {
-                       sam_io_sam_entry3("", &(r_u->sam[i]), ps, depth);
-               }
+       smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
 
-               for (i = 0; i < r_u->num_entries; i++)
-               {
-                       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);
-               }
-       }
+       smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name), gr1->hdr_acct_name.buffer, ps, depth);
+       prs_align(ps);
 
-       prs_uint32("status", ps, depth, &(r_u->status));
+       smb_io_unistr2("uni_acct_desc", &(gr1->uni_acct_desc), gr1->hdr_acct_desc.buffer, ps, depth);
 }
 
-
 /*******************************************************************
-makes a SAMR_Q_QUERY_ALIASINFO structure.
+makes a GROUP_INFO4 structure.
 ********************************************************************/
-void make_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_e,
-                               POLICY_HND *pol,
-                               uint16 switch_level)
+void make_samr_group_info4(GROUP_INFO4 *gr4, const char *acct_desc)
 {
-       if (q_e == NULL || pol == NULL) return;
-
-       DEBUG(5,("make_q_query_aliasinfo\n"));
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       if (gr4 == NULL) return;
 
-       memcpy(&(q_e->pol), pol, sizeof(*pol));
+       DEBUG(5,("make_samr_group_info4\n"));
 
-       q_e->switch_level = switch_level;
+       make_uni_hdr(&(gr4->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_unistr2(&(gr4->uni_acct_desc), acct_desc, acct_len);
 }
 
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_struct *ps, int depth)
+void samr_io_group_info4(char *desc,  GROUP_INFO4 *gr4, prs_struct *ps, int depth)
 {
-       if (q_e == NULL) return;
+       if (gr4 == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_query_aliasinfo");
+       prs_debug(ps, depth, desc, "samr_io_group_info4");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
-       prs_align(ps);
-
-       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
+       smb_io_unihdr ("hdr_acct_desc", &(gr4->hdr_acct_desc) , ps, depth); 
+       smb_io_unistr2("uni_acct_desc", &(gr4->uni_acct_desc), gr4->hdr_acct_desc.buffer, ps, depth);
 }
 
-
 /*******************************************************************
-makes a SAMR_R_QUERY_ALIASINFO structure.
+reads or writes a structure.
 ********************************************************************/
-void make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u,
-               uint16 switch_value, char *acct_desc,
-               uint32 status)
+void samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int depth)
 {
-       if (r_u == NULL) return;
+       if (ctr == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_group_info_ctr");
+       depth++;
+
+       prs_uint16("switch_value1", ps, depth, &(ctr->switch_value1));
+       prs_uint16("switch_value2", ps, depth, &(ctr->switch_value2));
+
+       switch (ctr->switch_value1)
+       {
+               case 1:
+               {
+                       samr_io_group_info1("group_info1", &(ctr->group.info1), ps, depth);
+                       break;
+               }
+               case 4:
+               {
+                       samr_io_group_info4("group_info4", &(ctr->group.info4), ps, depth);
+                       break;
+               }
+               default:
+               {
+                       DEBUG(4,("samr_group_info_ctr: unsupported switch level\n"));
+                       break;
+               }
+       }
+
+       prs_align(ps);
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_CREATE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_e,
+                               POLICY_HND *pol,
+                               const char *acct_desc)
+{
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_create_dom_group\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       make_uni_hdr(&(q_e->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_unistr2(&(q_e->uni_acct_desc), acct_desc, acct_len);
+
+       q_e->unknown_1 = 0x0002;
+       q_e->unknown_2 = 0x0001;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void 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;
+
+       prs_debug(ps, depth, desc, "samr_io_q_create_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       smb_io_unihdr ("hdr_acct_desc", &(q_e->hdr_acct_desc), ps, depth); 
+       smb_io_unistr2("uni_acct_desc", &(q_e->uni_acct_desc), q_e->hdr_acct_desc.buffer, ps, depth);
+       prs_align(ps);
+
+       prs_uint16("unknown_1", ps, depth, &(q_e->unknown_1));
+       prs_uint16("unknown_2", ps, depth, &(q_e->unknown_2));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_CREATE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_r_create_dom_group(SAMR_R_CREATE_DOM_GROUP *r_u, POLICY_HND *pol,
+               uint32 rid, uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_create_dom_group\n"));
+
+       memcpy(&(r_u->pol), pol, sizeof(*pol));
+
+       r_u->rid    = rid   ;
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_create_dom_group(char *desc,  SAMR_R_CREATE_DOM_GROUP *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_create_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("rid   ", ps, depth, &(r_u->rid   ));
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_DELETE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP *q_c, POLICY_HND *hnd)
+{
+       if (q_c == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_delete_dom_group\n"));
+
+       memcpy(&(q_c->group_pol), hnd, sizeof(q_c->group_pol));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_delete_dom_group(char *desc,  SAMR_Q_DELETE_DOM_GROUP *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
+}
+
+/*******************************************************************
+makes a SAMR_R_DELETE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_r_delete_dom_group(SAMR_R_DELETE_DOM_GROUP *r_u,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_delete_dom_group\n"));
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void 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;
+
+       prs_debug(ps, depth, desc, "samr_io_r_delete_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+
+/*******************************************************************
+makes a SAMR_Q_DEL_GROUPMEM structure.
+********************************************************************/
+void make_samr_q_del_groupmem(SAMR_Q_DEL_GROUPMEM *q_e,
+                               POLICY_HND *pol,
+                               uint32 rid)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_del_groupmem\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->rid = rid;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_del_groupmem(char *desc,  SAMR_Q_DEL_GROUPMEM *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_del_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("rid    ", ps, depth, &(q_e->rid));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_DEL_GROUPMEM structure.
+********************************************************************/
+void make_samr_r_del_groupmem(SAMR_R_DEL_GROUPMEM *r_u, POLICY_HND *pol,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_del_groupmem\n"));
+
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_del_groupmem(char *desc,  SAMR_R_DEL_GROUPMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_del_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_ADD_GROUPMEM structure.
+********************************************************************/
+void make_samr_q_add_groupmem(SAMR_Q_ADD_GROUPMEM *q_e,
+                               POLICY_HND *pol,
+                               uint32 rid)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_add_groupmem\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->rid = rid;
+       q_e->unknown = 0x0005;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_add_groupmem(char *desc,  SAMR_Q_ADD_GROUPMEM *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_add_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("rid    ", ps, depth, &(q_e->rid));
+       prs_uint32("unknown", ps, depth, &(q_e->unknown));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_ADD_GROUPMEM structure.
+********************************************************************/
+void make_samr_r_add_groupmem(SAMR_R_ADD_GROUPMEM *r_u, POLICY_HND *pol,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_add_groupmem\n"));
+
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_add_groupmem(char *desc,  SAMR_R_ADD_GROUPMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_add_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_SET_GROUPINFO structure.
+********************************************************************/
+void make_samr_q_set_groupinfo(SAMR_Q_SET_GROUPINFO *q_e,
+                               POLICY_HND *pol, GROUP_INFO_CTR *ctr)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_set_groupinfo\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+       q_e->ctr = ctr;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_set_groupinfo(char *desc,  SAMR_Q_SET_GROUPINFO *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_set_groupinfo");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       samr_group_info_ctr("ctr", q_e->ctr, ps, depth);
+}
+
+
+/*******************************************************************
+makes a SAMR_R_SET_GROUPINFO structure.
+********************************************************************/
+void make_samr_r_set_groupinfo(SAMR_R_SET_GROUPINFO *r_u, 
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_set_groupinfo\n"));
+
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_set_groupinfo(char *desc,  SAMR_R_SET_GROUPINFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_set_groupinfo");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_QUERY_GROUPINFO structure.
+********************************************************************/
+void make_samr_q_query_groupinfo(SAMR_Q_QUERY_GROUPINFO *q_e,
+                               POLICY_HND *pol,
+                               uint16 switch_level)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_query_groupinfo\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->switch_level = switch_level;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_query_groupinfo(char *desc,  SAMR_Q_QUERY_GROUPINFO *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_groupinfo");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_QUERY_GROUPINFO structure.
+********************************************************************/
+void make_samr_r_query_groupinfo(SAMR_R_QUERY_GROUPINFO *r_u, GROUP_INFO_CTR *ctr,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_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.
+********************************************************************/
+void samr_io_r_query_groupinfo(char *desc,  SAMR_R_QUERY_GROUPINFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_groupinfo");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr", ps, depth, &(r_u->ptr));
+       
+       if (r_u->ptr != 0)
+       {
+               samr_group_info_ctr("ctr", r_u->ctr, ps, depth);
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_QUERY_GROUPMEM structure.
+********************************************************************/
+void make_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM *q_c, POLICY_HND *hnd)
+{
+       if (q_c == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_query_groupmem\n"));
+
+       memcpy(&(q_c->group_pol), hnd, sizeof(q_c->group_pol));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_query_groupmem(char *desc,  SAMR_Q_QUERY_GROUPMEM *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
+}
+
+/*******************************************************************
+makes a SAMR_R_QUERY_GROUPMEM structure.
+********************************************************************/
+void make_samr_r_query_groupmem(SAMR_R_QUERY_GROUPMEM *r_u,
+               uint32 num_entries, uint32 *rid, uint32 *attr, uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_query_groupmem\n"));
+
+       if (status == 0x0)
+       {
+               r_u->ptr         = 1;
+               r_u->num_entries = num_entries;
+
+               r_u->ptr_attrs = attr != NULL ? 1 : 0;
+               r_u->ptr_rids = rid != NULL ? 1 : 0;
+
+               r_u->num_rids = num_entries;
+               r_u->rid  = rid;
+
+               r_u->num_attrs = num_entries;
+               r_u->attr = attr;
+       }
+       else
+       {
+               r_u->ptr         = 0;
+               r_u->num_entries = 0;
+       }
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struct *ps, int depth)
+{
+       int i;
+
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr", ps, depth, &(r_u->ptr));
+       prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
+
+       if (r_u->ptr != 0)
+       {
+               prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids ));
+               prs_uint32("ptr_attrs", ps, depth, &(r_u->ptr_attrs));
+
+               if (r_u->ptr_rids != 0)
+               {
+                       prs_uint32("num_rids", ps, depth, &(r_u->num_rids));
+                       for (i = 0; i < r_u->num_rids; i++)
+                       {
+                               prs_grow(ps);
+                               prs_uint32("", ps, depth, &(r_u->rid[i]));
+                       }
+               }
+
+               if (r_u->ptr_attrs != 0)
+               {
+                       prs_uint32("num_attrs", ps, depth, &(r_u->num_attrs));
+                       for (i = 0; i < r_u->num_attrs; i++)
+                       {
+                               prs_grow(ps);
+                               prs_uint32("", ps, depth, &(r_u->attr[i]));
+                       }
+               }
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_ENUM_DOM_GROUPS structure.
+********************************************************************/
+void make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e, POLICY_HND *pol,
+                               uint16 switch_level, uint32 start_idx, uint32 size)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_enum_dom_groups\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       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;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_enum_dom_groups(char *desc,  SAMR_Q_ENUM_DOM_GROUPS *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
+       prs_uint16("unknown_0   ", ps, depth, &(q_e->unknown_0   ));
+       prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
+       prs_uint32("unknown_1   ", ps, depth, &(q_e->unknown_1   ));
+       prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
+
+       prs_align(ps);
+}
+
+
+/*******************************************************************
+makes a SAMR_R_ENUM_DOM_GROUPS structure.
+********************************************************************/
+void make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
+               uint32 start_idx, uint32 num_sam_entries,
+               DOMAIN_GRP *grp,
+               uint32 status)
+{
+       int i;
+       int entries_added;
+
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_enum_dom_groups\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));
+       }
+
+       if (status == 0x0)
+       {
+               for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
+               {
+                       int acct_name_len = strlen(grp[i].name);
+                       int acct_desc_len = strlen(grp[i].comment);
+
+                       make_sam_entry3(&(r_u->sam[entries_added]),
+                                       start_idx + entries_added + 1,
+                                       acct_name_len,
+                                       acct_desc_len,
+                                       grp[i].rid);
+
+                       make_unistr2(&(r_u->str[entries_added].uni_grp_name), grp[i].name   , acct_name_len);
+                       make_unistr2(&(r_u->str[entries_added].uni_grp_desc), grp[i].comment, acct_desc_len);
+
+                       entries_added++;
+               }
+
+               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;
+       }
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_enum_dom_groups(char *desc,  SAMR_R_ENUM_DOM_GROUPS *r_u, prs_struct *ps, int depth)
+{
+       int i;
+
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("unknown_0    ", ps, depth, &(r_u->unknown_0    ));
+       prs_uint32("unknown_1    ", ps, depth, &(r_u->unknown_1    ));
+       prs_uint32("switch_level ", ps, depth, &(r_u->switch_level ));
+
+       if (r_u->switch_level != 0)
+       {
+               prs_uint32("num_entries  ", ps, depth, &(r_u->num_entries  ));
+               prs_uint32("ptr_entries  ", ps, depth, &(r_u->ptr_entries  ));
+
+               prs_uint32("num_entries2 ", ps, depth, &(r_u->num_entries2 ));
+
+               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+
+               for (i = 0; i < r_u->num_entries; i++)
+               {
+                       prs_grow(ps);
+                       sam_io_sam_entry3("", &(r_u->sam[i]), ps, depth);
+               }
+
+               for (i = 0; i < r_u->num_entries; i++)
+               {
+                       prs_grow(ps);
+                       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);
+               }
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_QUERY_USERGROUPS structure.
+********************************************************************/
+void make_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
+                               POLICY_HND *hnd)
+{
+       if (q_u == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_query_usergroups\n"));
+
+       memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+       prs_align(ps);
+}
+
+/*******************************************************************
+makes a SAMR_R_QUERY_USERGROUPS structure.
+********************************************************************/
+void make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
+               uint32 num_gids, DOM_GID *gid, uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_query_usergroups\n"));
+
+       if (status == 0x0)
+       {
+               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->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void 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;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr_0       ", ps, depth, &(r_u->ptr_0      ));
+
+       if (r_u->ptr_0 != 0)
+       {
+               prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
+               prs_uint32("ptr_1       ", ps, depth, &(r_u->ptr_1      ));
+
+               if (r_u->num_entries != 0)
+               {
+                       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
+
+                       for (i = 0; i < r_u->num_entries2; i++)
+                       {
+                               prs_grow(ps);
+                               smb_io_gid("", &(r_u->gid[i]), ps, depth);
+                       }
+               }
+       }
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_ENUM_DOM_ALIASES structure.
+********************************************************************/
+void make_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_e, POLICY_HND *pol, uint32 size)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_enum_dom_aliases\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->unknown_0 = 0;
+       q_e->max_size = size;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_enum_dom_aliases(char *desc,  SAMR_Q_ENUM_DOM_ALIASES *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_enum_dom_aliases");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("unknown_0", ps, depth, &(q_e->unknown_0));
+       prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
+
+       prs_align(ps);
+}
+
+
+/*******************************************************************
+makes a SAMR_R_ENUM_DOM_ALIASES structure.
+********************************************************************/
+void make_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u,
+               uint32 num_sam_entries, LOCAL_GRP *alss,
+               uint32 status)
+{
+       int i;
+
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_enum_dom_aliases\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->num_entries  = num_sam_entries;
+
+       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 < num_sam_entries; i++)
+               {
+                       int acct_name_len = strlen(alss[i].name);
+
+                       make_sam_entry(&(r_u->sam[i]),
+                                       acct_name_len,
+                                       alss[i].rid);
+
+                       make_unistr2(&(r_u->uni_grp_name[i]), alss[i].name   , acct_name_len);
+               }
+
+               r_u->num_entries4 = num_sam_entries;
+       }
+       else
+       {
+               r_u->ptr_entries = 0;
+       }
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_struct *ps, int depth)
+{
+       int i;
+
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("num_entries", ps, depth, &(r_u->num_entries));
+       prs_uint32("ptr_entries", ps, depth, &(r_u->ptr_entries));
+       
+       if (r_u->num_entries != 0 && r_u->ptr_entries != 0)
+       {
+               prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
+               prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2));
+               prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
+
+               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+
+               for (i = 0; i < r_u->num_entries; i++)
+               {
+                       sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
+               }
+
+               for (i = 0; i < r_u->num_entries; i++)
+               {
+                       smb_io_unistr2("", &(r_u->uni_grp_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth);
+               }
+
+               prs_align(ps);
+
+               prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a ALIAS_INFO3 structure.
+********************************************************************/
+void make_samr_alias_info3(ALIAS_INFO3 *al3, const char *acct_desc)
+{
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       if (al3 == NULL) return;
+
+       DEBUG(5,("make_samr_alias_info3\n"));
+
+       make_uni_hdr(&(al3->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_unistr2(&(al3->uni_acct_desc), acct_desc, acct_len);
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_alias_info3(char *desc,  ALIAS_INFO3 *al3, prs_struct *ps, int depth)
+{
+       if (al3 == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_alias_info3");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_unihdr ("hdr_acct_desc", &(al3->hdr_acct_desc) , ps, depth); 
+       smb_io_unistr2("uni_acct_desc", &(al3->uni_acct_desc), al3->hdr_acct_desc.buffer, ps, depth);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_alias_info_ctr(char *desc,  ALIAS_INFO_CTR *ctr, prs_struct *ps, int depth)
+{
+       if (ctr == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_alias_info_ctr");
+       depth++;
+
+       prs_uint16("switch_value1", ps, depth, &(ctr->switch_value1));
+       prs_uint16("switch_value2", ps, depth, &(ctr->switch_value2));
+
+       switch (ctr->switch_value1)
+       {
+               case 3:
+               {
+                       samr_io_alias_info3("alias_info3", &(ctr->alias.info3), ps, depth);
+                       break;
+               }
+               default:
+               {
+                       DEBUG(4,("samr_alias_info_ctr: unsupported switch level\n"));
+                       break;
+               }
+       }
+
+       prs_align(ps);
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_QUERY_ALIASINFO structure.
+********************************************************************/
+void make_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_e,
+                               POLICY_HND *pol,
+                               uint16 switch_level)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_query_aliasinfo\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->switch_level = switch_level;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_aliasinfo");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_QUERY_ALIASINFO structure.
+********************************************************************/
+void make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u, ALIAS_INFO_CTR *ctr,
+               uint32 status)
+{
+       if (r_u == NULL) return;
 
        DEBUG(5,("make_samr_r_query_aliasinfo\n"));
 
-       r_u->ptr = 0;
+       r_u->ptr = (status == 0x0 && ctr != NULL) ? 1 : 0;
+       r_u->ctr = ctr;
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_aliasinfo");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr", ps, depth, &(r_u->ptr));
+       
+       if (r_u->ptr != 0)
+       {
+               samr_alias_info_ctr("ctr", r_u->ctr, ps, depth);
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_SET_ALIASINFO structure.
+********************************************************************/
+void make_samr_q_set_aliasinfo(SAMR_Q_SET_ALIASINFO *q_u, POLICY_HND *hnd,
+                               ALIAS_INFO_CTR *ctr)
+{
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_set_aliasinfo\n"));
+
+       memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
+       q_u->ctr = ctr;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_set_aliasinfo(char *desc,  SAMR_Q_SET_ALIASINFO *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_set_aliasinfo");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+       samr_alias_info_ctr("ctr", q_u->ctr, ps, depth);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_set_aliasinfo(char *desc,  SAMR_R_SET_ALIASINFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_set_aliasinfo");
+       depth++;
+
+       prs_align(ps);
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+
+/*******************************************************************
+makes a SAMR_Q_QUERY_USERALIASES structure.
+********************************************************************/
+void make_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
+                               POLICY_HND *hnd,
+                               DOM_SID *sid)
+{
+       if (q_u == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_query_useraliases\n"));
+
+       memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
+
+       q_u->num_sids1 = 1;
+       q_u->ptr = 1;
+       q_u->num_sids2 = 1;
+
+       {
+               q_u->ptr_sid[0] = 1;
+               make_dom_sid2(&q_u->sid[0], sid);
+       }
+}
+
+/*******************************************************************
+reads or writes a SAMR_Q_QUERY_USERALIASES structure.
+********************************************************************/
+void samr_io_q_query_useraliases(char *desc,  SAMR_Q_QUERY_USERALIASES *q_u, prs_struct *ps, int depth)
+{
+       fstring tmp;
+       int i;
+
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_useraliases");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("num_sids1", ps, depth, &(q_u->num_sids1));
+       prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
+       prs_uint32("num_sids2", ps, depth, &(q_u->num_sids2));
+
+       SMB_ASSERT_ARRAY(q_u->ptr_sid, q_u->num_sids2);
+
+       for (i = 0; i < q_u->num_sids2; i++)
+       {
+               slprintf(tmp, sizeof(tmp) - 1, "ptr[%02d]", i);
+               prs_uint32(tmp, ps, depth, &(q_u->ptr_sid[i]));
+       }
+
+       for (i = 0; i < q_u->num_sids2; i++)
+       {
+               if (q_u->ptr_sid[i] != 0)
+               {
+                       prs_grow(ps);
+                       slprintf(tmp, sizeof(tmp)-1, "sid[%02d]", i);
+                       smb_io_dom_sid2(tmp, &(q_u->sid[i]), ps, depth); 
+               }
+       }
+
+       prs_align(ps);
+}
+
+
+/*******************************************************************
+makes a SAMR_R_QUERY_USERALIASES structure.
+********************************************************************/
+void make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES *r_u,
+               uint32 num_rids, uint32 *rid, uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_query_useraliases\n"));
+
+       if (status == 0x0)
+       {
+               r_u->num_entries  = num_rids;
+               r_u->ptr = 1;
+               r_u->num_entries2 = num_rids;
+
+               r_u->rid = rid;
+       }
+       else
+       {
+               r_u->num_entries  = 0;
+               r_u->ptr = 0;
+               r_u->num_entries2 = 0;
+       }
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_query_useraliases(char *desc,  SAMR_R_QUERY_USERALIASES *r_u, prs_struct *ps, int depth)
+{
+       fstring tmp;
+       int i;
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_useraliases");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("num_entries", ps, depth, &(r_u->num_entries));
+       prs_uint32("ptr        ", ps, depth, &(r_u->ptr        ));
+       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
+
+       if (r_u->num_entries != 0)
+       {
+               for (i = 0; i < r_u->num_entries2; i++)
+               {
+                       slprintf(tmp, sizeof(tmp)-1, "rid[%02d]", i);
+                       prs_uint32(tmp, ps, depth, &(r_u->rid[i]));
+               }
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_OPEN_ALIAS structure.
+********************************************************************/
+void make_samr_q_open_alias(SAMR_Q_OPEN_ALIAS *q_u, POLICY_HND *pol,
+                               uint32 unknown_0, uint32 rid)
+{
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_open_alias\n"));
+
+       memcpy(&(q_u->dom_pol), pol, sizeof(q_u->dom_pol));
+
+       /* example values: 0x0000 0008 */
+       q_u->unknown_0 = unknown_0; 
+
+       q_u->rid_alias = rid; 
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_open_alias(char *desc,  SAMR_Q_OPEN_ALIAS *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_open_alias");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth); 
+
+       prs_uint32("unknown_0", ps, depth, &(q_u->unknown_0));
+       prs_uint32("rid_alias", ps, depth, &(q_u->rid_alias));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_open_alias");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_LOOKUP_RIDS structure.
+********************************************************************/
+void make_samr_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u,
+               POLICY_HND *pol, uint32 flags,
+               uint32 num_rids, uint32 *rid)
+{
+       int i;
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_unknwon_12\n"));
+
+       memcpy(&(q_u->pol), pol, sizeof(*pol));
+
+       q_u->num_rids1 = num_rids;
+       q_u->flags     = flags;
+       q_u->ptr       = 0;
+       q_u->num_rids2 = num_rids;
+
+       for (i = 0; i < num_rids; i++)
+       {
+               q_u->rid[i] = rid[i];
+       }
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_lookup_rids(char *desc,  SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps, int depth)
+{
+       int i;
+       fstring tmp;
+
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_lookup_rids");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("num_rids1", ps, depth, &(q_u->num_rids1));
+       prs_uint32("flags    ", ps, depth, &(q_u->flags    ));
+       prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
+       prs_uint32("num_rids2", ps, depth, &(q_u->num_rids2));
+
+       SMB_ASSERT_ARRAY(q_u->rid, q_u->num_rids2);
+
+       for (i = 0; i < q_u->num_rids2; i++)
+       {
+               prs_grow(ps);
+               slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
+               prs_uint32(tmp, ps, depth, &(q_u->rid[i]));
+       }
+
+       prs_align(ps);
+}
+
+
+/*******************************************************************
+makes a SAMR_R_LOOKUP_RIDS structure.
+********************************************************************/
+void make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
+               uint32 num_names, fstring *name, uint8 *type,
+               uint32 status)
+{
+       int i;
+       if (r_u == NULL || name == NULL || type == NULL) return;
+
+       DEBUG(5,("make_samr_r_lookup_rids\n"));
+
+       if (status == 0x0)
+       {
+               r_u->num_names1 = num_names;
+               r_u->ptr_names  = 1;
+               r_u->num_names2 = num_names;
+
+               r_u->num_types1 = num_names;
+               r_u->ptr_types  = 1;
+               r_u->num_types2 = num_names;
+
+               SMB_ASSERT_ARRAY(r_u->hdr_name, num_names);
+
+               for (i = 0; i < num_names; i++)
+               {
+                       int len = name[i] != NULL ? strlen(name[i]) : 0;
+                       make_uni_hdr(&(r_u->hdr_name[i]), len    , len, name[i] ? 1 : 0);
+                       make_unistr2(&(r_u->uni_name[i]), name[i], len);
+                       r_u->type[i] = type[i];
+               }
+       }
+       else
+       {
+               r_u->num_names1 = num_names;
+               r_u->ptr_names  = 0;
+               r_u->num_names2 = num_names;
+
+               r_u->num_types1 = num_names;
+               r_u->ptr_types  = 0;
+               r_u->num_types2 = num_names;
+       }
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_lookup_rids(char *desc,  SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth)
+{
+       int i;
+       fstring tmp;
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_lookup_rids");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("num_names1", ps, depth, &(r_u->num_names1));
+       prs_uint32("ptr_names ", ps, depth, &(r_u->ptr_names ));
+       prs_uint32("num_names2", ps, depth, &(r_u->num_names2));
+
+       if (r_u->ptr_names != 0 && r_u->num_names1 != 0)
+       {
+               SMB_ASSERT_ARRAY(r_u->hdr_name, r_u->num_names2);
+
+               for (i = 0; i < r_u->num_names2; i++)
+               {
+                       prs_grow(ps);
+                       slprintf(tmp, sizeof(tmp) - 1, "hdr[%02d]  ", i);
+                       smb_io_unihdr ("", &(r_u->hdr_name[i]), ps, depth); 
+               }
+               for (i = 0; i < r_u->num_names2; i++)
+               {
+                       prs_grow(ps);
+                       slprintf(tmp, sizeof(tmp) - 1, "str[%02d]  ", i);
+                       smb_io_unistr2("", &(r_u->uni_name[i]), r_u->hdr_name[i].buffer, ps, depth); 
+               }
+       }
+
+       prs_align(ps);
+
+       prs_uint32("num_types1", ps, depth, &(r_u->num_types1));
+       prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types ));
+       prs_uint32("num_types2", ps, depth, &(r_u->num_types2));
+
+       if (r_u->ptr_types != 0 && r_u->num_types1 != 0)
+       {
+               for (i = 0; i < r_u->num_types2; i++)
+               {
+                       prs_grow(ps);
+                       slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
+                       prs_uint32(tmp, ps, depth, &(r_u->type[i]));
+               }
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_OPEN_ALIAS structure.
+********************************************************************/
+void make_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS *q_u, POLICY_HND *hnd)
+{
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_delete_alias\n"));
+
+       memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_delete_alias(char *desc,  SAMR_Q_DELETE_DOM_ALIAS *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_delete_alias");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_delete_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_delete_alias");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_CREATE_DOM_ALIAS structure.
+********************************************************************/
+void make_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS *q_u, POLICY_HND *hnd,
+                               const char *acct_desc)
+{
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_create_dom_alias\n"));
+
+       memcpy(&(q_u->dom_pol), hnd, sizeof(q_u->dom_pol));
+
+       make_uni_hdr(&(q_u->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_unistr2(&(q_u->uni_acct_desc), acct_desc, acct_len);
+
+       q_u->unknown_1 = 0x001f;
+       q_u->unknown_2 = 0x000f;
+}
+
 
-       if (status == 0)
-       {
-               r_u->switch_value = switch_value;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void 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;
 
-               switch (switch_value)
-               {
-                       case 3:
-                       {
-                               int acct_len = acct_desc ? strlen(acct_desc) : 0;
+       prs_debug(ps, depth, desc, "samr_io_q_create_dom_alias");
+       depth++;
 
-                               r_u->ptr = 1;
+       prs_align(ps);
 
-                               make_uni_hdr(&(r_u->alias.info3.hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
-                               make_unistr2(&(r_u->alias.info3.uni_acct_desc), acct_desc, acct_len);
+       smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth); 
 
-                               break;
-                       }
+       smb_io_unihdr ("hdr_acct_desc", &(q_u->hdr_acct_desc) , ps, depth); 
+       smb_io_unistr2("uni_acct_desc", &(q_u->uni_acct_desc), q_u->hdr_acct_desc.buffer, ps, depth);
 
-                       default:
-                       {
-                               DEBUG(4,("make_samr_r_query_aliasinfo: unsupported switch level\n"));
-                               break;
-                       }
-               }
-       }
+       prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
+       prs_uint16("unknown_2", ps, depth, &(q_u->unknown_2));
+}
+
+/*******************************************************************
+makes a SAMR_R_CREATE_DOM_ALIAS structure.
+********************************************************************/
+void make_samr_r_create_dom_alias(SAMR_R_CREATE_DOM_ALIAS *r_u, POLICY_HND *pol,
+               uint32 rid, uint32 status)
+{
+       if (r_u == NULL) return;
 
+       DEBUG(5,("make_samr_r_create_dom_alias\n"));
+
+       memcpy(&(r_u->alias_pol), pol, sizeof(*pol));
+       r_u->rid    = rid   ;
        r_u->status = status;
 }
 
@@ -1428,215 +2993,221 @@ void make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_struct *ps, int depth)
+void 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;
 
-       prs_debug(ps, depth, desc, "samr_io_r_query_aliasinfo");
+       prs_debug(ps, depth, desc, "samr_io_r_create_dom_alias");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("ptr         ", ps, depth, &(r_u->ptr         ));
-       
-       if (r_u->ptr != 0)
-       {
-               prs_uint16("switch_value", ps, depth, &(r_u->switch_value));
-               prs_align(ps);
-
-               if (r_u->switch_value != 0)
-               {
-                       switch (r_u->switch_value)
-                       {
-                               case 3:
-                               {
-                                       smb_io_unihdr ("", &(r_u->alias.info3.hdr_acct_desc), ps, depth);
-                                       smb_io_unistr2("", &(r_u->alias.info3.uni_acct_desc), r_u->alias.info3.hdr_acct_desc.buffer, ps, depth);
-                                       break;
-                               }
-                               default:
-                               {
-                                       DEBUG(4,("samr_io_r_query_aliasinfo: unsupported switch level\n"));
-                                       break;
-                               }
-                       }
-               }
-       }
-
-       prs_align(ps);
+       smb_io_pol_hnd("alias_pol", &(r_u->alias_pol), ps, depth); 
+       prs_uint32("rid", ps, depth, &(r_u->rid));
 
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
+
+
 /*******************************************************************
-reads or writes a SAMR_Q_LOOKUP_IDS structure.
+makes a SAMR_Q_ADD_ALIASMEM structure.
 ********************************************************************/
-void samr_io_q_lookup_ids(char *desc,  SAMR_Q_LOOKUP_IDS *q_u, prs_struct *ps, int depth)
+void make_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM *q_u, POLICY_HND *hnd,
+                               DOM_SID *sid)
 {
-       fstring tmp;
-       int i;
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_add_aliasmem\n"));
+
+       memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
+       make_dom_sid2(&q_u->sid, sid);
+}
 
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_add_aliasmem(char *desc,  SAMR_Q_ADD_ALIASMEM *q_u, prs_struct *ps, int depth)
+{
        if (q_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_lookup_ids");
+       prs_debug(ps, depth, desc, "samr_io_q_add_aliasmem");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
-       prs_align(ps);
-
-       prs_uint32("num_sids1", ps, depth, &(q_u->num_sids1));
-       prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
-       prs_uint32("num_sids2", ps, depth, &(q_u->num_sids2));
+       smb_io_pol_hnd ("alias_pol", &(q_u->alias_pol), ps, depth); 
+       smb_io_dom_sid2("sid      ", &(q_u->sid      ), ps, depth); 
+}
 
-       for (i = 0; i < q_u->num_sids2; i++)
-       {
-               sprintf(tmp, "ptr[%02d]", i);
-               prs_uint32(tmp, ps, depth, &(q_u->ptr_sid[i]));
-       }
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_add_aliasmem(char *desc,  SAMR_R_ADD_ALIASMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
 
-       for (i = 0; i < q_u->num_sids2; i++)
-       {
-               if (q_u->ptr_sid[i] != 0)
-               {
-                       sprintf(tmp, "sid[%02d]", i);
-                       smb_io_dom_sid2(tmp, &(q_u->sid[i]), ps, depth); 
-               }
-       }
+       prs_debug(ps, depth, desc, "samr_io_r_add_aliasmem");
+       depth++;
 
        prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
 }
 
 
 /*******************************************************************
-makes a SAMR_R_LOOKUP_IDS structure.
+makes a SAMR_Q_DEL_ALIASMEM structure.
 ********************************************************************/
-void make_samr_r_lookup_ids(SAMR_R_LOOKUP_IDS *r_u,
-               uint32 num_rids, uint32 *rid, uint32 status)
+void make_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM *q_u, POLICY_HND *hnd,
+                               DOM_SID *sid)
 {
-       int i;
-       if (r_u == NULL) return;
+       if (q_u == NULL) return;
 
-       DEBUG(5,("make_samr_r_lookup_ids\n"));
+       DEBUG(5,("make_samr_q_del_aliasmem\n"));
 
-       if (status == 0x0)
-       {
-               r_u->num_entries  = num_rids;
-               r_u->ptr = 1;
-               r_u->num_entries2 = num_rids;
+       memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
+       make_dom_sid2(&q_u->sid, sid);
+}
 
-               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;
-       }
 
-       r_u->status = status;
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_del_aliasmem(char *desc,  SAMR_Q_DEL_ALIASMEM *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_del_aliasmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+       smb_io_dom_sid2("sid      ", &(q_u->sid      ), ps, depth); 
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_lookup_ids(char *desc,  SAMR_R_LOOKUP_IDS *r_u, prs_struct *ps, int depth)
+void samr_io_r_del_aliasmem(char *desc,  SAMR_R_DEL_ALIASMEM *r_u, prs_struct *ps, int depth)
 {
-       fstring tmp;
-       int i;
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_lookup_ids");
+       prs_debug(ps, depth, desc, "samr_io_r_del_aliasmem");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("num_entries", ps, depth, &(r_u->num_entries));
-       prs_uint32("ptr        ", ps, depth, &(r_u->ptr        ));
-       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
 
-       if (r_u->num_entries != 0)
-       {
+/*******************************************************************
+makes a SAMR_Q_DELETE_DOM_ALIAS structure.
+********************************************************************/
+void make_samr_q_delete_dom_alias(SAMR_Q_DELETE_DOM_ALIAS *q_c, POLICY_HND *hnd)
+{
+       if (q_c == NULL || hnd == NULL) return;
 
-               for (i = 0; i < r_u->num_entries2; i++)
-               {
-                       sprintf(tmp, "rid[%02d]", i);
-                       prs_uint32(tmp, ps, depth, &(r_u->rid[i]));
-               }
-       }
+       DEBUG(5,("make_samr_q_delete_dom_alias\n"));
 
-       prs_uint32("status", ps, depth, &(r_u->status));
+       memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth)
+void 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;
 
-       prs_debug(ps, depth, desc, "samr_io_q_lookup_names");
+       prs_debug(ps, depth, desc, "samr_io_q_delete_dom_alias");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
-       prs_align(ps);
+       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+}
 
-       prs_uint32("num_rids1", ps, depth, &(q_u->num_rids1));
-       prs_uint32("rid      ", ps, depth, &(q_u->rid      ));
-       prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
-       prs_uint32("num_rids2", ps, depth, &(q_u->num_rids2));
+/*******************************************************************
+makes a SAMR_R_DELETE_DOM_ALIAS structure.
+********************************************************************/
+void make_samr_r_delete_dom_alias(SAMR_R_DELETE_DOM_ALIAS *r_u,
+               uint32 status)
+{
+       if (r_u == NULL) return;
 
-       for (i = 0; i < q_u->num_rids2; i++)
-       {
-               smb_io_unihdr ("", &(q_u->hdr_user_name[i]), ps, depth); 
-       }
-       for (i = 0; i < q_u->num_rids2; i++)
-       {
-               smb_io_unistr2("", &(q_u->uni_user_name[i]), q_u->hdr_user_name[i].buffer, ps, depth); 
-       }
+       DEBUG(5,("make_samr_r_delete_dom_alias\n"));
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_delete_dom_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_delete_dom_alias");
+       depth++;
 
        prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
 }
 
 
 /*******************************************************************
-makes a SAMR_R_LOOKUP_NAMES structure.
+makes a SAMR_Q_QUERY_ALIASMEM structure.
 ********************************************************************/
-void make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
-               uint32 num_rids, uint32 *rid, uint32 status)
+void make_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM *q_c, POLICY_HND *hnd)
+{
+       if (q_c == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_query_aliasmem\n"));
+
+       memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_query_aliasmem(char *desc,  SAMR_Q_QUERY_ALIASMEM *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_query_aliasmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+}
+
+/*******************************************************************
+makes a SAMR_R_QUERY_ALIASMEM structure.
+********************************************************************/
+void make_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM *r_u,
+               uint32 num_sids, DOM_SID2 *sid, uint32 status)
 {
-       int i;
        if (r_u == NULL) return;
 
-       DEBUG(5,("make_samr_r_lookup_names\n"));
+       DEBUG(5,("make_samr_r_query_aliasmem\n"));
 
        if (status == 0x0)
        {
-               r_u->num_entries  = num_rids;
-               r_u->undoc_buffer = 1;
-               r_u->num_entries2 = num_rids;
-
-               for (i = 0; i < num_rids; i++)
-               {
-                       make_dom_rid3(&(r_u->dom_rid[i]), rid[i]);
-               }
+               r_u->num_sids  = num_sids;
+               r_u->ptr       = (num_sids != 0) ? 1 : 0;
+               r_u->num_sids1 = num_sids;
 
-               r_u->num_entries3 = num_rids;
+               r_u->sid = sid;
        }
        else
        {
-               r_u->num_entries  = 0;
-               r_u->undoc_buffer = 0;
-               r_u->num_entries2 = 0;
-               r_u->num_entries3 = 0;
+               r_u->ptr      = 0;
+               r_u->num_sids = 0;
        }
 
        r_u->status = status;
@@ -1645,70 +3216,86 @@ void make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *ps, int depth)
+void samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struct *ps, int depth)
 {
        int i;
+       uint32 ptr_sid[MAX_LOOKUP_SIDS];
+
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_lookup_names");
+       prs_debug(ps, depth, desc, "samr_io_r_query_aliasmem");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("num_entries ", ps, depth, &(r_u->num_entries ));
-       prs_uint32("undoc_buffer", ps, depth, &(r_u->undoc_buffer));
-       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
+       prs_uint32("num_sids ", ps, depth, &(r_u->num_sids));
+       prs_uint32("ptr", ps, depth, &(r_u->ptr));
 
-       if (r_u->num_entries != 0)
+       if (r_u->ptr != 0)
        {
-               for (i = 0; i < r_u->num_entries2; i++)
+               SMB_ASSERT_ARRAY(ptr_sid, r_u->num_sids);
+
+               if (r_u->num_sids != 0)
                {
-                       smb_io_dom_rid3("", &(r_u->dom_rid[i]), ps, depth);
-               }
+                       prs_uint32("num_sids1", ps, depth, &(r_u->num_sids1));
 
+                       for (i = 0; i < r_u->num_sids1; i++)
+                       {
+                               prs_grow(ps);
+                               ptr_sid[i] = 1;
+                               prs_uint32("", ps, depth, &(ptr_sid[i]));
+                       }
+                       for (i = 0; i < r_u->num_sids1; i++)
+                       {
+                               prs_grow(ps);
+                               if (ptr_sid[i] != 0)
+                               {
+                                       smb_io_dom_sid2("", &(r_u->sid[i]), ps, depth);
+                               }
+                       }
+               }
        }
-
-       prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
-
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
 /*******************************************************************
-makes a SAMR_Q_UNKNOWN_12 structure.
+makes a SAMR_Q_LOOKUP_NAMES structure.
 ********************************************************************/
-void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
-               POLICY_HND *pol, uint32 rid,
-               uint32 num_gids, uint32 *gid)
+void make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
+               POLICY_HND *pol, uint32 flags,
+               uint32 num_names, const char **name)
 {
        int i;
        if (q_u == NULL) return;
 
-       DEBUG(5,("make_samr_r_unknwon_12\n"));
+       DEBUG(5,("make_samr_q_lookup_names\n"));
 
        memcpy(&(q_u->pol), pol, sizeof(*pol));
 
-       q_u->num_gids1 = num_gids;
-       q_u->rid       = rid;
+       q_u->num_names1 = num_names;
+       q_u->flags     = flags;
        q_u->ptr       = 0;
-       q_u->num_gids2 = num_gids;
+       q_u->num_names2 = num_names;
 
-       for (i = 0; i < num_gids; i++)
+       for (i = 0; i < num_names; i++)
        {
-               q_u->gid[i] = gid[i];
+               int len_name = name[i] != NULL ? strlen(name[i]) : 0;
+               make_uni_hdr(&(q_u->hdr_name[i]), len_name, len_name, name[i] != NULL);  /* unicode header for user_name */
+               make_unistr2(&(q_u->uni_name[i]), name[i], len_name);  /* unicode string for machine account */
        }
 }
 
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_unknown_12(char *desc,  SAMR_Q_UNKNOWN_12 *q_u, prs_struct *ps, int depth)
+void samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth)
 {
        int i;
-       fstring tmp;
 
        if (q_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_unknown_12");
+       prs_debug(ps, depth, desc, "samr_io_q_lookup_names");
        depth++;
 
        prs_align(ps);
@@ -1716,15 +3303,22 @@ void samr_io_q_unknown_12(char *desc,  SAMR_Q_UNKNOWN_12 *q_u, prs_struct *ps, i
        smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
        prs_align(ps);
 
-       prs_uint32("num_gids1", ps, depth, &(q_u->num_gids1));
-       prs_uint32("rid      ", ps, depth, &(q_u->rid      ));
+       prs_uint32("num_names1", ps, depth, &(q_u->num_names1));
+       prs_uint32("flags     ", ps, depth, &(q_u->flags     ));
        prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
-       prs_uint32("num_gids2", ps, depth, &(q_u->num_gids2));
+       prs_uint32("num_names2", ps, depth, &(q_u->num_names2));
 
-       for (i = 0; i < q_u->num_gids2; i++)
+       SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2);
+
+       for (i = 0; i < q_u->num_names2; i++)
+       {
+               prs_grow(ps);
+               smb_io_unihdr ("", &(q_u->hdr_name[i]), ps, depth); 
+       }
+       for (i = 0; i < q_u->num_names2; i++)
        {
-               sprintf(tmp, "gid[%02d]  ", i);
-               prs_uint32(tmp, ps, depth, &(q_u->gid[i]));
+               prs_grow(ps);
+               smb_io_unistr2("", &(q_u->uni_name[i]), q_u->hdr_name[i].buffer, ps, depth); 
        }
 
        prs_align(ps);
@@ -1732,44 +3326,43 @@ void samr_io_q_unknown_12(char *desc,  SAMR_Q_UNKNOWN_12 *q_u, prs_struct *ps, i
 
 
 /*******************************************************************
-makes a SAMR_R_UNKNOWN_12 structure.
+makes a SAMR_R_LOOKUP_NAMES structure.
 ********************************************************************/
-void make_samr_r_unknown_12(SAMR_R_UNKNOWN_12 *r_u,
-               uint32 num_aliases, fstring *als_name, uint32 *num_als_usrs,
-               uint32 status)
+void make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
+               uint32 num_rids, uint32 *rid, uint8 *type, uint32 status)
 {
        int i;
-       if (r_u == NULL || als_name == NULL || num_als_usrs == NULL) return;
+       if (r_u == NULL) return;
 
-       DEBUG(5,("make_samr_r_unknown_12\n"));
+       DEBUG(5,("make_samr_r_lookup_names\n"));
 
        if (status == 0x0)
        {
-               r_u->num_aliases1 = num_aliases;
-               r_u->ptr_aliases  = 1;
-               r_u->num_aliases2 = num_aliases;
+               r_u->num_types1 = num_rids;
+               r_u->ptr_types  = 1;
+               r_u->num_types2 = num_rids;
 
-               r_u->num_als_usrs1 = num_aliases;
-               r_u->ptr_als_usrs  = 1;
-               r_u->num_als_usrs2 = num_aliases;
+               r_u->num_rids1 = num_rids;
+               r_u->ptr_rids  = 1;
+               r_u->num_rids2 = num_rids;
 
-               for (i = 0; i < num_aliases; i++)
+               SMB_ASSERT_ARRAY(r_u->rid, num_rids);
+
+               for (i = 0; i < num_rids; i++)
                {
-                       int als_len = als_name[i] != NULL ? strlen(als_name[i]) : 0;
-                       make_uni_hdr(&(r_u->hdr_als_name[i]), als_len    , als_len, als_name[i] ? 1 : 0);
-                       make_unistr2(&(r_u->uni_als_name[i]), als_name[i], als_len);
-                       r_u->num_als_usrs[i] = num_als_usrs[i];
+                       r_u->rid [i] = rid [i];
+                       r_u->type[i] = type[i];
                }
        }
        else
        {
-               r_u->num_aliases1 = num_aliases;
-               r_u->ptr_aliases  = 0;
-               r_u->num_aliases2 = num_aliases;
+               r_u->num_types1 = 0;
+               r_u->ptr_types  = 0;
+               r_u->num_types2 = 0;
 
-               r_u->num_als_usrs1 = num_aliases;
-               r_u->ptr_als_usrs  = 0;
-               r_u->num_als_usrs2 = num_aliases;
+               r_u->num_rids1 = 0;
+               r_u->ptr_rids  = 0;
+               r_u->num_rids2 = 0;
        }
 
        r_u->status = status;
@@ -1778,53 +3371,50 @@ void make_samr_r_unknown_12(SAMR_R_UNKNOWN_12 *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_unknown_12(char *desc,  SAMR_R_UNKNOWN_12 *r_u, prs_struct *ps, int depth)
+void samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *ps, int depth)
 {
        int i;
        fstring tmp;
+
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_unknown_12");
+       prs_debug(ps, depth, desc, "samr_io_r_lookup_names");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("num_aliases1", ps, depth, &(r_u->num_aliases1));
-       prs_uint32("ptr_aliases ", ps, depth, &(r_u->ptr_aliases ));
-       prs_uint32("num_aliases2", ps, depth, &(r_u->num_aliases2));
+       prs_uint32("num_rids1", ps, depth, &(r_u->num_rids1));
+       prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids ));
 
-       if (r_u->ptr_aliases != 0 && r_u->num_aliases1 != 0)
+       if (r_u->ptr_rids != 0 && r_u->num_rids1 != 0)
        {
-               for (i = 0; i < r_u->num_aliases2; i++)
-               {
-                       sprintf(tmp, "als_hdr[%02d]  ", i);
-                       smb_io_unihdr ("", &(r_u->hdr_als_name[i]), ps, depth); 
-               }
-               for (i = 0; i < r_u->num_aliases2; i++)
+               prs_uint32("num_rids2", ps, depth, &(r_u->num_rids2));
+               for (i = 0; i < r_u->num_rids2; i++)
                {
-                       sprintf(tmp, "als_str[%02d]  ", i);
-                       smb_io_unistr2("", &(r_u->uni_als_name[i]), r_u->hdr_als_name[i].buffer, ps, depth); 
+                       prs_grow(ps);
+                       slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
+                       prs_uint32(tmp, ps, depth, &(r_u->rid[i]));
                }
        }
 
-       prs_align(ps);
-
-       prs_uint32("num_als_usrs1", ps, depth, &(r_u->num_als_usrs1));
-       prs_uint32("ptr_als_usrs ", ps, depth, &(r_u->ptr_als_usrs ));
-       prs_uint32("num_als_usrs2", ps, depth, &(r_u->num_als_usrs2));
+       prs_uint32("num_types1", ps, depth, &(r_u->num_types1));
+       prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types ));
 
-       if (r_u->ptr_als_usrs != 0 && r_u->num_als_usrs1 != 0)
+       if (r_u->ptr_types != 0 && r_u->num_types1 != 0)
        {
-               for (i = 0; i < r_u->num_als_usrs2; i++)
+               prs_uint32("num_types2", ps, depth, &(r_u->num_types2));
+               for (i = 0; i < r_u->num_types2; i++)
                {
-                       sprintf(tmp, "als_usrs[%02d]  ", i);
-                       prs_uint32(tmp, ps, depth, &(r_u->num_als_usrs[i]));
+                       prs_grow(ps);
+                       slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
+                       prs_uint32(tmp, ps, depth, &(r_u->type[i]));
                }
        }
 
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -1834,7 +3424,7 @@ void make_samr_q_open_user(SAMR_Q_OPEN_USER *q_u,
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("samr_make_q_open_user\n"));
+       DEBUG(5,("samr_make_samr_q_open_user\n"));
 
        memcpy(&q_u->domain_pol, pol, sizeof(q_u->domain_pol));
        
@@ -1842,7 +3432,6 @@ void make_samr_q_open_user(SAMR_Q_OPEN_USER *q_u,
        q_u->user_rid  = rid;
 }
 
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -1882,108 +3471,6 @@ void samr_io_r_open_user(char *desc,  SAMR_R_OPEN_USER *r_u, prs_struct *ps, int
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_USERGROUPS structure.
-********************************************************************/
-void make_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
-                               POLICY_HND *hnd)
-{
-       if (q_u == NULL || hnd == NULL) return;
-
-       DEBUG(5,("make_samr_q_query_usergroups\n"));
-
-       memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_q_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL) return;
-
-       prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
-       depth++;
-
-       prs_align(ps);
-
-       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
-       prs_align(ps);
-}
-
-/*******************************************************************
-makes a SAMR_R_QUERY_USERGROUPS structure.
-********************************************************************/
-void make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
-               uint32 num_gids, DOM_GID *gid, uint32 status)
-{
-       if (r_u == NULL) return;
-
-       DEBUG(5,("make_samr_r_query_usergroups\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->gid = gid;
-
-#if 0
-               int i;
-               for (i = 0; i < num_gids && i < LSA_MAX_GROUPS; i++)
-               {
-                       r_u->gid[i].g_rid = gid[i].g_rid;
-                       r_u->gid[i].attr  = gid[i].attr ;
-               }
-#endif
-
-       }
-       else
-       {
-               r_u->ptr_0       = 0;
-               r_u->num_entries = 0;
-               r_u->ptr_1       = 0;
-       }
-
-       r_u->status = status;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void 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;
-
-       prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
-       depth++;
-
-       prs_align(ps);
-
-       prs_uint32("ptr_0       ", ps, depth, &(r_u->ptr_0      ));
-
-       if (r_u->ptr_0 != 0)
-       {
-               prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
-               prs_uint32("ptr_1       ", ps, depth, &(r_u->ptr_1      ));
-
-               if (r_u->num_entries != 0)
-               {
-                       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
-
-                       for (i = 0; i < r_u->num_entries2; i++)
-                       {
-                               smb_io_gid("", &(r_u->gid[i]), ps, depth);
-                       }
-               }
-       }
-       prs_uint32("status", ps, depth, &(r_u->status));
-}
-
 /*******************************************************************
 makes a SAMR_Q_QUERY_USERINFO structure.
 ********************************************************************/
@@ -1998,6 +3485,7 @@ void make_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
        q_u->switch_value = switch_value;
 }
 
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -2021,7 +3509,7 @@ void samr_io_q_query_userinfo(char *desc,  SAMR_Q_QUERY_USERINFO *q_u, prs_struc
 /*******************************************************************
 reads or writes a LOGON_HRS structure.
 ********************************************************************/
-void sam_io_logon_hrs(char *desc,  LOGON_HRS *hrs, prs_struct *ps, int depth)
+static void sam_io_logon_hrs(char *desc,  LOGON_HRS *hrs, prs_struct *ps, int depth)
 {
        if (hrs == NULL) return;
 
@@ -2041,6 +3529,34 @@ void sam_io_logon_hrs(char *desc,  LOGON_HRS *hrs, prs_struct *ps, int depth)
        prs_uint8s (False, "hours", ps, depth, hrs->hours, hrs->len);
 }
 
+/*******************************************************************
+makes a SAM_USER_INFO_10 structure.
+********************************************************************/
+void make_sam_user_info10(SAM_USER_INFO_10 *usr,
+                               uint32 acb_info)
+{
+       if (usr == NULL) return;
+
+       DEBUG(5,("make_sam_user_info10\n"));
+
+       usr->acb_info = acb_info;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void sam_io_user_info10(char *desc,  SAM_USER_INFO_10 *usr, prs_struct *ps, int depth)
+{
+       if (usr == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_user_info10");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("acb_info", ps, depth, &(usr->acb_info));
+}
+
 /*******************************************************************
 makes a SAM_USER_INFO_11 structure.
 ********************************************************************/
@@ -2055,7 +3571,7 @@ void make_sam_user_info11(SAM_USER_INFO_11 *usr,
        int len_mach_acct;
        if (usr == NULL || expiry == NULL || mach_acct == NULL) return;
 
-       DEBUG(5,("make_samr_r_unknown_24\n"));
+       DEBUG(5,("make_sam_user_info11\n"));
 
        len_mach_acct = strlen(mach_acct);
 
@@ -2088,8 +3604,6 @@ void make_sam_user_info11(SAM_USER_INFO_11 *usr,
        usr->padding_8    = 0;            /* 0 - padding 4 bytes */
        
        make_unistr2(&(usr->uni_mach_acct), mach_acct, len_mach_acct);  /* unicode string for machine account */
-
-       bzero(usr->padding_9, sizeof(usr->padding_9)); /* 0 - padding 48 bytes */
 }
 
 /*******************************************************************
@@ -2195,16 +3709,16 @@ void make_sam_user_info21(SAM_USER_INFO_21 *usr,
        usr->pass_can_change_time  = *pass_can_change_time;
        usr->pass_must_change_time = *pass_must_change_time;
 
-       make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   , len_user_name   , len_user_name    != 0);
-       make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   , len_full_name   , len_full_name    != 0);
-       make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    , len_home_dir    , len_home_dir     != 0);
-       make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   , len_dir_drive   , len_dir_drive    != 0);
-       make_uni_hdr(&(usr->hdr_logon_script), len_logon_script, len_logon_script, len_logon_script != 0);
-       make_uni_hdr(&(usr->hdr_profile_path), len_profile_path, len_profile_path, len_profile_path != 0);
-       make_uni_hdr(&(usr->hdr_acct_desc   ), len_description , len_description , len_description  != 0);
-       make_uni_hdr(&(usr->hdr_workstations), len_workstations, len_workstations, len_workstations != 0);
-       make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str , len_unknown_str , len_workstations != 0);
-       make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial , len_munged_dial , len_workstations != 0);
+       make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   , len_user_name   , 1);
+       make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   , len_full_name   , 1);
+       make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    , len_home_dir    , 1);
+       make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   , len_dir_drive   , 1);
+       make_uni_hdr(&(usr->hdr_logon_script), len_logon_script, len_logon_script, 1);
+       make_uni_hdr(&(usr->hdr_profile_path), len_profile_path, len_profile_path, 1);
+       make_uni_hdr(&(usr->hdr_acct_desc   ), len_description , len_description , 1);
+       make_uni_hdr(&(usr->hdr_workstations), len_workstations, len_workstations, 1);
+       make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str , len_unknown_str , 1);
+       make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial , len_munged_dial , 1);
 
        bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
        bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
@@ -2248,7 +3762,7 @@ void make_sam_user_info21(SAM_USER_INFO_21 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void sam_io_user_info21(char *desc,  SAM_USER_INFO_21 *usr, prs_struct *ps, int depth)
+static void sam_io_user_info21(char *desc,  SAM_USER_INFO_21 *usr, prs_struct *ps, int depth)
 {
        if (usr == NULL) return;
 
@@ -2310,6 +3824,7 @@ void sam_io_user_info21(char *desc,  SAM_USER_INFO_21 *usr, prs_struct *ps, int
        if (usr->ptr_logon_hrs)
        {
                sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs)   , ps, depth);
+               prs_align(ps);
        }
 }
 
@@ -2360,7 +3875,7 @@ void make_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO *r_u,
 
                        default:
                        {
-                               DEBUG(4,("make_samr_r_query_aliasinfo: unsupported switch level\n"));
+                               DEBUG(4,("make_samr_r_query_userinfo: unsupported switch level\n"));
                                break;
                        }
                }
@@ -2389,7 +3904,6 @@ void samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struc
        {
                switch (r_u->switch_value)
                {
-/*
                        case 0x10:
                        {
                                if (r_u->info.id10 != NULL)
@@ -2399,10 +3913,11 @@ void samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struc
                                else
                                {
                                        DEBUG(2,("samr_io_r_query_userinfo: info pointer not initialised\n"));
-                                       return NULL;
+                                       return;
                                }
                                break;
                        }
+/*
                        case 0x11:
                        {
                                if (r_u->info.id11 != NULL)
@@ -2412,7 +3927,7 @@ void samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struc
                                else
                                {
                                        DEBUG(2,("samr_io_r_query_userinfo: info pointer not initialised\n"));
-                                       return NULL;
+                                       return;
                                }
                                break;
                        }
@@ -2442,75 +3957,6 @@ void samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struc
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
-
-/*******************************************************************
-makes a SAMR_Q_UNKNOWN_21 structure.
-********************************************************************/
-void make_samr_q_unknown_21(SAMR_Q_UNKNOWN_21 *q_c,
-                               POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
-{
-       if (q_c == NULL || hnd == NULL) return;
-
-       DEBUG(5,("make_samr_q_unknown_21\n"));
-
-       memcpy(&(q_c->group_pol), hnd, sizeof(q_c->group_pol));
-       q_c->unknown_1 = unk_1;
-       q_c->unknown_2 = unk_2;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_q_unknown_21(char *desc,  SAMR_Q_UNKNOWN_21 *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL) return;
-
-       prs_debug(ps, depth, desc, "samr_io_q_unknown_21");
-       depth++;
-
-       prs_align(ps);
-
-       smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
-       prs_align(ps);
-
-       prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
-       prs_uint16("unknown_2", ps, depth, &(q_u->unknown_2));
-}
-
-/*******************************************************************
-makes a SAMR_Q_UNKNOWN_13 structure.
-********************************************************************/
-void make_samr_q_unknown_13(SAMR_Q_UNKNOWN_13 *q_c,
-                               POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
-{
-       if (q_c == NULL || hnd == NULL) return;
-
-       DEBUG(5,("make_samr_q_unknown_13\n"));
-
-       memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
-       q_c->unknown_1 = unk_1;
-       q_c->unknown_2 = unk_2;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_q_unknown_13(char *desc,  SAMR_Q_UNKNOWN_13 *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL) return;
-
-       prs_debug(ps, depth, desc, "samr_io_q_unknown_13");
-       depth++;
-
-       prs_align(ps);
-
-       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
-       prs_align(ps);
-
-       prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
-       prs_uint16("unknown_2", ps, depth, &(q_u->unknown_2));
-}
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -2565,15 +4011,17 @@ void make_samr_q_connect(SAMR_Q_CONNECT *q_u,
 
        if (q_u == NULL) return;
 
-       DEBUG(5,("make_q_connect\n"));
+       DEBUG(5,("make_samr_q_connect\n"));
 
        /* make PDC server name \\server */
-       make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name);  
+       q_u->ptr_srv_name = len_srv_name > 0 ? 1 : 0; 
+       make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name+1);  
 
        /* example values: 0x0000 0002 */
        q_u->unknown_0 = unknown_0; 
 }
 
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -2613,50 +4061,52 @@ void samr_io_r_connect(char *desc,  SAMR_R_CONNECT *r_u, prs_struct *ps, int dep
 }
 
 /*******************************************************************
-makes a SAMR_Q_OPEN_ALIAS structure.
+makes a SAMR_Q_CONNECT_ANON structure.
 ********************************************************************/
-void make_samr_q_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
-                               uint32 unknown_0, uint32 rid)
+void make_samr_q_connect_anon(SAMR_Q_CONNECT_ANON *q_u)
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("make_q_open_alias\n"));
-
-       /* example values: 0x0000 0008 */
-       q_u->unknown_0 = unknown_0; 
+       DEBUG(5,("make_samr_q_connect_anon\n"));
 
-       q_u->rid_alias = rid; 
+       q_u->ptr       = 1;
+       q_u->unknown_0 = 0x5c; /* server name (?!!) */
+       q_u->unknown_1 = 0x01;
+       q_u->unknown_2 = 0x20;
 }
 
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_open_alias(char *desc,  SAMR_Q_OPEN_ALIAS *q_u, prs_struct *ps, int depth)
+void samr_io_q_connect_anon(char *desc,  SAMR_Q_CONNECT_ANON *q_u, prs_struct *ps, int depth)
 {
        if (q_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_open_alias");
+       prs_debug(ps, depth, desc, "samr_io_q_connect_anon");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("unknown_0", ps, depth, &(q_u->unknown_0));
-       prs_uint32("rid_alias", ps, depth, &(q_u->rid_alias));
+       prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
+       prs_uint16("unknown_0", ps, depth, &(q_u->unknown_0));
+       prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
+       prs_uint32("unknown_2", ps, depth, &(q_u->unknown_2));
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, int depth)
+void samr_io_r_connect_anon(char *desc,  SAMR_R_CONNECT_ANON *r_u, prs_struct *ps, int depth)
 {
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_open_alias");
+       prs_debug(ps, depth, desc, "samr_io_r_connect_anon");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+       smb_io_pol_hnd("connect_pol", &(r_u->connect_pol), ps, depth); 
        prs_align(ps);
 
        prs_uint32("status", ps, depth, &(r_u->status));
@@ -2671,7 +4121,7 @@ void make_samr_q_unknown_38(SAMR_Q_UNKNOWN_38 *q_u, char *srv_name)
 
        if (q_u == NULL) return;
 
-       DEBUG(5,("make_q_unknown_38\n"));
+       DEBUG(5,("make_samr_q_unknown_38\n"));
 
        q_u->ptr = 1;
        make_uni_hdr(&(q_u->hdr_srv_name), len_srv_name, len_srv_name, len_srv_name != 0);
@@ -2702,16 +4152,16 @@ void samr_io_q_unknown_38(char *desc,  SAMR_Q_UNKNOWN_38 *q_u, prs_struct *ps, i
 /*******************************************************************
 makes a SAMR_R_UNKNOWN_38 structure.
 ********************************************************************/
-void make_samr_r_unknown_38(SAMR_R_UNKNOWN_38 *r_u,
-                               uint16 level, uint32 status)
+void make_samr_r_unknown_38(SAMR_R_UNKNOWN_38 *r_u)
 {
        if (r_u == NULL) return;
 
        DEBUG(5,("make_r_unknown_38\n"));
 
-       r_u->level.value = level;
-       r_u->ptr_0       = 0;
-       r_u->status      = status;
+       r_u->unk_0 = 0;
+       r_u->unk_1 = 0;
+       r_u->unk_2 = 0;
+       r_u->unk_3 = 0;
 }
 
 /*******************************************************************
@@ -2726,9 +4176,25 @@ void samr_io_r_unknown_38(char *desc,  SAMR_R_UNKNOWN_38 *r_u, prs_struct *ps, i
 
        prs_align(ps);
 
-       smb_io_lookup_level("level ", &(r_u->level), ps, depth); 
-       prs_uint32("ptr_0 ", ps, depth, &(r_u->ptr_0 ));
-       prs_uint32("status", ps, depth, &(r_u->status));
+       prs_uint16("unk_0", ps, depth, &(r_u->unk_0));
+       prs_align(ps);
+       prs_uint16("unk_1", ps, depth, &(r_u->unk_1));
+       prs_align(ps);
+       prs_uint16("unk_2", ps, depth, &(r_u->unk_2));
+       prs_align(ps);
+       prs_uint16("unk_3", ps, depth, &(r_u->unk_3));
+       prs_align(ps);
+}
+
+/*******************************************************************
+make a SAMR_ENC_PASSWD structure.
+********************************************************************/
+void make_enc_passwd(SAMR_ENC_PASSWD *pwd, char pass[512])
+{
+       if (pwd == NULL) return;
+
+       pwd->ptr = 1;
+       memcpy(pwd->pass, pass, sizeof(pwd->pass)); 
 }
 
 /*******************************************************************
@@ -2747,6 +4213,17 @@ void samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD *pwd, prs_struct *ps, int de
        prs_uint8s(False, "pwd", ps, depth, pwd->pass, sizeof(pwd->pass)); 
 }
 
+/*******************************************************************
+makes a SAMR_ENC_HASH structure.
+********************************************************************/
+void make_enc_hash(SAMR_ENC_HASH *hsh, uchar hash[16])
+{
+       if (hsh == NULL) return;
+
+       hsh->ptr = 1;
+       memcpy(hsh->hash, hash, sizeof(hsh->hash));
+}
+
 /*******************************************************************
 reads or writes a SAMR_ENC_HASH structure.
 ********************************************************************/
@@ -2763,34 +4240,91 @@ void samr_io_enc_hash(char *desc, SAMR_ENC_HASH *hsh, prs_struct *ps, int depth)
        prs_uint8s(False, "hash", ps, depth, hsh->hash, sizeof(hsh->hash)); 
 }
 
-#if 0
-/* SAMR_Q_CHGPASSWD_USER */
-typedef struct q_samr_chgpasswd_user_info
+/*******************************************************************
+makes a SAMR_R_UNKNOWN_38 structure.
+********************************************************************/
+void make_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);
+
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_chgpasswd_user\n"));
+
+       q_u->ptr_0 = 1;
+       make_uni_hdr(&(q_u->hdr_dest_host), len_dest_host, len_dest_host, len_dest_host != 0);
+       make_unistr2(&(q_u->uni_dest_host), dest_host, len_dest_host);  
+       make_uni_hdr(&(q_u->hdr_user_name), len_user_name, len_user_name, len_user_name != 0);
+       make_unistr2(&(q_u->uni_user_name), user_name, len_user_name);  
+
+       make_enc_passwd(&(q_u->nt_newpass), nt_newpass);
+       make_enc_hash  (&(q_u->nt_oldhash), nt_oldhash);
+
+       q_u->unknown = 0x01;
+
+       make_enc_passwd(&(q_u->lm_newpass), lm_newpass);
+       make_enc_hash  (&(q_u->lm_oldhash), lm_oldhash);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct *ps, int depth)
 {
-       uint32 ptr_0;
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_chgpasswd_user");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr_0", ps, depth, &(q_u->ptr_0));
 
-       UNIHDR hdr_server; /* server name unicode header */
-       UNISTR2 uni_server; /* server name unicode string */
+       smb_io_unihdr ("", &(q_u->hdr_dest_host), ps, depth); 
+       smb_io_unistr2("", &(q_u->uni_dest_host), q_u->hdr_dest_host.buffer, ps, depth); 
+       smb_io_unihdr ("", &(q_u->hdr_user_name), ps, depth); 
+       smb_io_unistr2("", &(q_u->uni_user_name), q_u->hdr_user_name.buffer, ps, depth); 
 
-       UNIHDR hdr_user_name;    /* username unicode string header */
-       UNISTR2 uni_user_name;    /* username unicode string */
+       samr_io_enc_passwd("nt_newpass", &(q_u->nt_newpass), ps, depth); 
+       prs_grow(ps);
+       samr_io_enc_hash  ("nt_oldhash", &(q_u->nt_oldhash), ps, depth); 
 
-       SAMR_ENC_PASSWD nt_newpass;
-       SAMR_ENC_HASH nt_oldhash;
+       prs_uint32("unknown", ps, depth, &(q_u->unknown));
+
+       samr_io_enc_passwd("lm_newpass", &(q_u->lm_newpass), ps, depth); 
+       prs_grow(ps);
+       samr_io_enc_hash  ("lm_oldhash", &(q_u->lm_oldhash), ps, depth); 
+}
 
-       uint32 unknown_1; /* seems to always contain 0001 */
+/*******************************************************************
+makes a SAMR_R_CHGPASSWD_USER structure.
+********************************************************************/
+void make_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status)
+{
+       if (r_u == NULL) return;
 
-       SAMR_ENC_PASSWD lm_newpass;
-       SAMR_ENC_HASH lm_oldhash;
+       DEBUG(5,("make_r_chgpasswd_user\n"));
 
-} SAMR_Q_CHGPASSWD_USER;
+       r_u->status = status;
+}
 
-/* SAMR_R_CHGPASSWD_USER */
-typedef struct r_samr_chgpasswd_user_info
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct *ps, int depth)
 {
-       uint32 result; /* 0 == OK, C000006A (NT_STATUS_WRONG_PASSWORD) */
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_chgpasswd_user");
+       depth++;
 
-} SAMR_R_CHGPASSWD_USER;
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
 
-#endif /* 0 */