Win9x user level security.
[samba.git] / source3 / rpc_parse / parse_samr.c
index ec4411b783b157bb312c0f2c6e539151029c19ad..0e7c891b792b902512e7e97f10621be4876d8bcf 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
@@ -73,20 +73,80 @@ void samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
+/*******************************************************************
+makes a SAMR_Q_LOOKUP_DOMAIN structure.
+********************************************************************/
+void make_samr_q_lookup_domain(SAMR_Q_LOOKUP_DOMAIN *q_u,
+               POLICY_HND *pol, const char *dom_name)
+{
+       int len_name = strlen(dom_name);
+
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_lookup_domain\n"));
+
+       memcpy(&(q_u->connect_pol), pol, sizeof(*pol));
+
+       make_uni_hdr(&(q_u->hdr_domain), len_name, len_name, 1);
+       make_unistr2(&(q_u->uni_domain), dom_name, len_name);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_lookup_domain(char *desc, SAMR_Q_LOOKUP_DOMAIN *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_lookup_domain");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("connect_pol", &(q_u->connect_pol), ps, depth);
+       prs_align(ps);
+
+       smb_io_unihdr("hdr_domain", &(q_u->hdr_domain), ps, depth);
+       smb_io_unistr2("uni_domain", &(q_u->uni_domain),
+                      q_u->hdr_domain.buffer, ps, depth);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_lookup_domain(char *desc, SAMR_R_LOOKUP_DOMAIN *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_lookup_domain");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("ptr", ps, depth, &(r_u->ptr_sid));
+
+       if (r_u->ptr_sid != 0)
+       {
+               smb_io_dom_sid2("sid", &(r_u->dom_sid), ps, depth);
+               prs_align(ps);
+       }
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
 void make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
-                               POLICY_HND *connect_pol, uint32 rid,
+                               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);
 }
 
@@ -105,7 +165,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);
@@ -137,7 +197,7 @@ 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_2c\n"));
+       DEBUG(5,("samr_make_samr_q_unknown_2c\n"));
 
        memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
 }
@@ -199,7 +259,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;
@@ -233,7 +293,7 @@ void make_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("samr_make_q_query_dom_info\n"));
+       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;
@@ -258,6 +318,62 @@ void samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_st
        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.
 ********************************************************************/
@@ -376,6 +492,16 @@ void samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_str
        {
                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);
@@ -773,6 +899,68 @@ static void sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int
        smb_io_unihdr("unihdr", &(sam->hdr_grp_desc), ps, depth); /* account name unicode string header */
 }
 
+/*******************************************************************
+makes a SAM_ENTRY4 structure.
+********************************************************************/
+static void make_sam_entry4(SAM_ENTRY4 *sam, uint32 user_idx, 
+                               uint32 len_acct_name)
+{
+       if (sam == NULL) return;
+
+       DEBUG(5,("make_sam_entry4\n"));
+
+       sam->user_idx = user_idx;
+       make_str_hdr(&(sam->hdr_acct_name), len_acct_name, len_acct_name,
+                    len_acct_name != 0);
+}
+
+/*******************************************************************
+reads or writes a SAM_ENTRY4 structure.
+********************************************************************/
+static void sam_io_sam_entry4(char *desc, SAM_ENTRY4 *sam, prs_struct *ps, int depth)
+{
+       if (sam == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_sam_entry4");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("user_idx", ps, depth, &(sam->user_idx));
+       smb_io_strhdr("strhdr", &(sam->hdr_acct_name), ps, depth);
+}
+
+/*******************************************************************
+makes a SAM_ENTRY5 structure.
+********************************************************************/
+static void make_sam_entry5(SAM_ENTRY5 *sam, uint32 grp_idx, 
+                               uint32 len_grp_name)
+{
+       if (sam == NULL) return;
+
+       DEBUG(5,("make_sam_entry5\n"));
+
+       sam->grp_idx = grp_idx;
+       make_str_hdr(&(sam->hdr_grp_name), len_grp_name, len_grp_name,
+                    len_grp_name != 0);
+}
+
+/*******************************************************************
+reads or writes a SAM_ENTRY5 structure.
+********************************************************************/
+static void sam_io_sam_entry5(char *desc, SAM_ENTRY5 *sam, prs_struct *ps, int depth)
+{
+       if (sam == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_sam_entry5");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("grp_idx", ps, depth, &(sam->grp_idx));
+       smb_io_strhdr("strhdr", &(sam->hdr_grp_name), ps, depth);
+}
+
 /*******************************************************************
 makes a SAM_ENTRY structure.
 ********************************************************************/
@@ -806,17 +994,16 @@ static void sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int de
 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;
@@ -837,13 +1024,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_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_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);
 }
@@ -853,7 +1038,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;
@@ -869,10 +1054,9 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
                         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;
@@ -917,11 +1101,10 @@ 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));
@@ -952,346 +1135,401 @@ 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 max_entries)
 {
        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));
+       memcpy(&(q_e->domain_pol), pol, sizeof(*pol));
 
-       q_e->unknown_0 = 0;
-       q_e->max_size = size;
-}
+       q_e->switch_level = switch_level;
 
+       q_e->start_idx = start_idx;
+       q_e->max_entries = max_entries;
+       q_e->max_size = 0xffff; /* Not especially useful */
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-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);
 
-       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       smb_io_pol_hnd("domain_pol", &(q_e->domain_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_align(ps);
+
+       prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
+       prs_uint32("max_entries ", ps, depth, &(q_e->max_entries ));
+       prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
 }
 
 
 /*******************************************************************
-makes a SAMR_R_ENUM_DOM_ALIASES structure.
+makes a SAM_DISPINFO_1 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_dispinfo_1(SAM_DISPINFO_1 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
+       uint32 len_sam_name, len_sam_full, len_sam_desc;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
        int i;
 
-       if (r_u == NULL) return;
-
-       DEBUG(5,("make_samr_r_enum_dom_aliases\n"));
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
 
-       if (num_sam_entries >= MAX_SAM_ENTRIES)
-       {
-               num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d\n", 
-                        num_sam_entries));
-       }
+       DEBUG(5,("make_sam_dispinfo_1\n"));
 
-       r_u->num_entries  = num_sam_entries;
+       max_entries = *num_entries;
+       max_data_size = *data_size;
 
-       if (num_sam_entries > 0)
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); 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;
-
-               SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries);
+               len_sam_name = pass[i].uni_user_name.uni_str_len;
+               len_sam_full = pass[i].uni_full_name.uni_str_len;
+               len_sam_desc = pass[i].uni_acct_desc.uni_str_len;
 
-               for (i = 0; i < num_sam_entries; i++)
-               {
-                       make_sam_entry(&(r_u->sam[i]),
-                                      grps[i].uni_user_name.uni_str_len,
-                                      grps[i].user_rid);
+               make_sam_entry1(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name, len_sam_full, len_sam_desc,
+                               pass[i].user_rid, pass[i].acb_info);
 
-                       copy_unistr2(&(r_u->uni_grp_name[i]), &(grps[i].uni_user_name));
-               }
+               copy_unistr2(&(sam->str[i].uni_acct_name), &(pass[i].uni_user_name));
+               copy_unistr2(&(sam->str[i].uni_full_name), &(pass[i].uni_full_name));
+               copy_unistr2(&(sam->str[i].uni_acct_desc), &(pass[i].uni_acct_desc));
 
-               r_u->num_entries4 = num_sam_entries;
-       }
-       else
-       {
-               r_u->ptr_entries = 0;
+               dsize += sizeof(SAM_ENTRY1);
+               dsize += len_sam_name + len_sam_full + len_sam_desc;
        }
 
-       r_u->status = status;
+       *num_entries = i;
+        *data_size = dsize;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_struct *ps, int depth)
+static void sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 *sam, uint32 num_entries, prs_struct *ps, int depth)
 {
        int i;
 
-       if (r_u == NULL) return;
+       if (sam == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases");
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_1");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("num_entries", ps, depth, &(r_u->num_entries));
-       prs_uint32("ptr_entries", ps, depth, &(r_u->ptr_entries));
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-       if (r_u->num_entries != 0 && r_u->ptr_entries != 0)
+       for (i = 0; i < num_entries; i++)
        {
-               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_grow(ps);
+               sam_io_sam_entry1("", &(sam->sam[i]), ps, depth);
        }
 
-       prs_uint32("status", ps, depth, &(r_u->status));
+       for (i = 0; i < 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,
+                                sam->sam[i].hdr_user_desc.buffer,
+                                ps, depth);
+       }
 }
 
 
 /*******************************************************************
-makes a SAMR_Q_QUERY_DISPINFO structure.
+makes a SAM_DISPINFO_2 structure.
 ********************************************************************/
-void make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
-                               uint16 switch_level, uint32 start_idx, uint32 size)
+void make_sam_dispinfo_2(SAM_DISPINFO_2 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
-       if (q_e == NULL || pol == NULL) return;
+       uint32 len_sam_name, len_sam_desc;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
+       int i;
 
-       DEBUG(5,("make_q_query_dispinfo\n"));
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
 
-       memcpy(&(q_e->pol), pol, sizeof(*pol));
+       DEBUG(5,("make_sam_dispinfo_2\n"));
 
-       q_e->switch_level = switch_level;
+       max_entries = *num_entries;
+       max_data_size = *data_size;
 
-       q_e->unknown_0 = 0;
-       q_e->start_idx = start_idx;
-       q_e->unknown_1 = 0x000007d0;
-       q_e->max_size  = size;
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
+       {
+               len_sam_name = pass[i].uni_user_name.uni_str_len;
+               len_sam_desc = pass[i].uni_acct_desc.uni_str_len;
+
+               make_sam_entry2(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name, len_sam_desc,
+                               pass[i].user_rid, pass[i].acb_info);
+
+               copy_unistr2(&(sam->str[i].uni_srv_name), &(pass[i].uni_user_name));
+               copy_unistr2(&(sam->str[i].uni_srv_desc), &(pass[i].uni_acct_desc));
+
+               dsize += sizeof(SAM_ENTRY2);
+               dsize += len_sam_name + len_sam_desc;
+       }
+
+       *num_entries = i;
+        *data_size = dsize;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struct *ps, int depth)
+static void sam_io_sam_dispinfo_2(char *desc, SAM_DISPINFO_2 *sam, uint32 num_entries, prs_struct *ps, int depth)
 {
-       if (q_e == NULL) return;
+       int i;
 
-       prs_debug(ps, depth, desc, "samr_io_q_query_dispinfo");
+       if (sam == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_2");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
-       prs_align(ps);
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-       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    ));
+       for (i = 0; i < num_entries; i++)
+       {
+               prs_grow(ps);
+               sam_io_sam_entry2("", &(sam->sam[i]), ps, depth);
+       }
 
-       prs_align(ps);
+       for (i = 0; i < 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,
+                                ps, depth);
+       }
 }
 
 
 /*******************************************************************
-makes a SAM_INFO_2 structure.
+makes a SAM_DISPINFO_3 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])
+void make_sam_dispinfo_3(SAM_DISPINFO_3 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        DOMAIN_GRP *grp)
 {
+       uint32 len_sam_name, len_sam_desc;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
        int i;
-       int entries_added;
 
-       if (sam == NULL) return;
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
 
-       DEBUG(5,("make_sam_info_2\n"));
+       DEBUG(5,("make_sam_dispinfo_3\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));
-       }
+       max_entries = *num_entries;
+       max_data_size = *data_size;
 
-       for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
        {
-               if (IS_BITS_SET_ALL(pass[i].acb_info, acb_mask))
-               {
-                       make_sam_entry2(&(sam->sam[entries_added]),
-                                       start_idx + entries_added + 1,
-                                       pass[i].uni_user_name.uni_str_len,
-                                       pass[i].uni_acct_desc.uni_str_len,
-                                       pass[i].user_rid,
-                                       pass[i].acb_info);
+               len_sam_name = strlen(grp[i].name);
+               len_sam_desc = strlen(grp[i].comment);
 
-                       copy_unistr2(&(sam->str[entries_added].uni_srv_name), &(pass[i].uni_user_name));
-                       copy_unistr2(&(sam->str[entries_added].uni_srv_desc), &(pass[i].uni_acct_desc));
+               make_sam_entry3(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name, len_sam_desc,
+                               grp[i].rid);
 
-                       entries_added++;
-               }
+               make_unistr2(&(sam->str[i].uni_grp_name), grp[i].name   , len_sam_name);
+               make_unistr2(&(sam->str[i].uni_grp_desc), grp[i].comment, len_sam_desc);
 
-               sam->num_entries   = entries_added;
-               sam->ptr_entries   = 1;
-               sam->num_entries2  = entries_added;
+               dsize += sizeof(SAM_ENTRY3);
+               dsize += (len_sam_name + len_sam_desc) * 2;
        }
+
+       *num_entries = i;
+        *data_size = dsize;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static void sam_io_sam_info_2(char *desc,  SAM_INFO_2 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_dispinfo_3(char *desc, SAM_DISPINFO_3 *sam, int num_entries, prs_struct *ps, int depth)
 {
        int i;
 
        if (sam == NULL) return;
 
-       prs_debug(ps, depth, desc, "sam_io_sam_info_2");
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_3");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("num_entries  ", ps, depth, &(sam->num_entries  ));
-       prs_uint32("ptr_entries  ", ps, depth, &(sam->ptr_entries  ));
-
-       prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 ));
-
-       SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-       for (i = 0; i < sam->num_entries; i++)
+       for (i = 0; i < num_entries; i++)
        {
                prs_grow(ps);
-               sam_io_sam_entry2("", &(sam->sam[i]), ps, depth);
+               sam_io_sam_entry3("", &(sam->sam[i]), ps, depth);
        }
 
-       for (i = 0; i < sam->num_entries; i++)
+       for (i = 0; i < 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,
-                                                        ps, depth);
+               sam_io_sam_str3 ("", &(sam->str[i]),
+                                sam->sam[i].hdr_grp_name.buffer,
+                                sam->sam[i].hdr_grp_desc.buffer,
+                                ps, depth);
        }
 }
 
 
 /*******************************************************************
-makes a SAM_INFO_1 structure.
+makes a SAM_DISPINFO_4 structure.
 ********************************************************************/
-void make_sam_info_1(SAM_INFO_1 *sam, uint32 acb_mask,
-               uint32 start_idx, uint32 num_sam_entries,
-               SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
+void make_sam_dispinfo_4(SAM_DISPINFO_4 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
+       fstring sam_name;
+       uint32 len_sam_name;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
        int i;
-       int entries_added;
 
-       if (sam == NULL) return;
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
 
-       DEBUG(5,("make_sam_info_1\n"));
+       DEBUG(5,("make_sam_dispinfo_4\n"));
 
-       if (num_sam_entries >= MAX_SAM_ENTRIES)
+       max_entries = *num_entries;
+       max_data_size = *data_size;
+
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
        {
-               num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d\n", 
-                        num_sam_entries));
+               len_sam_name = pass[i].uni_user_name.uni_str_len;
+
+               make_sam_entry4(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name);
+
+               unistr2_to_ascii(sam_name, &(pass[i].uni_user_name), sizeof(sam_name));
+               make_string2(&(sam->str[i].acct_name), sam_name, len_sam_name);
+
+               dsize += sizeof(SAM_ENTRY4);
+               dsize += len_sam_name;
        }
 
-       for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
+       *num_entries = i;
+        *data_size = dsize;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static void sam_io_sam_dispinfo_4(char *desc, SAM_DISPINFO_4 *sam, int num_entries, prs_struct *ps, int depth)
+{
+       int i;
+
+       if (sam == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_4");
+       depth++;
+
+       prs_align(ps);
+
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
+
+       for (i = 0; i < num_entries; i++)
        {
-               if (IS_BITS_SET_ALL(pass[i].acb_info, acb_mask))
-               {
-                       make_sam_entry1(&(sam->sam[entries_added]),
-                                               start_idx + entries_added + 1,
-                                               pass[i].uni_user_name.uni_str_len,
-                                               pass[i].uni_full_name.uni_str_len, 
-                                               pass[i].uni_acct_desc.uni_str_len,
-                                               pass[i].user_rid,
-                                               pass[i].acb_info);
-
-                       copy_unistr2(&(sam->str[entries_added].uni_acct_name), &(pass[i].uni_user_name));
-                       copy_unistr2(&(sam->str[entries_added].uni_full_name), &(pass[i].uni_full_name));
-                       copy_unistr2(&(sam->str[entries_added].uni_acct_desc), &(pass[i].uni_acct_desc));
-
-                       entries_added++;
-               }
+               prs_grow(ps);
+               sam_io_sam_entry4("", &(sam->sam[i]), ps, depth);
        }
 
-       sam->num_entries   = entries_added;
-       sam->ptr_entries   = 1;
-       sam->num_entries2  = entries_added;
+       for (i = 0; i < num_entries; i++)
+       {
+               prs_grow(ps);
+               smb_io_string2("acct_name", &(sam->str[i].acct_name),
+                              sam->sam[i].hdr_acct_name.buffer, ps, depth);
+       }
 }
 
 
+/*******************************************************************
+makes a SAM_DISPINFO_5 structure.
+********************************************************************/
+void make_sam_dispinfo_5(SAM_DISPINFO_5 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        DOMAIN_GRP *grp)
+{
+       uint32 len_sam_name;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
+       int i;
+
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
+
+       DEBUG(5,("make_sam_dispinfo_5\n"));
+
+       max_entries = *num_entries;
+       max_data_size = *data_size;
+
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
+       {
+               len_sam_name = strlen(grp[i].name);
+
+               make_sam_entry5(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name);
+
+               make_string2(&(sam->str[i].grp_name), grp[i].name,
+                            len_sam_name);
+
+               dsize += sizeof(SAM_ENTRY5);
+               dsize += len_sam_name;
+       }
+
+       *num_entries = i;
+        *data_size = dsize;
+}
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static void sam_io_sam_info_1(char *desc,  SAM_INFO_1 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_dispinfo_5(char *desc, SAM_DISPINFO_5 *sam, int num_entries, prs_struct *ps, int depth)
 {
        int i;
 
        if (sam == NULL) return;
 
-       prs_debug(ps, depth, desc, "sam_io_sam_info_1");
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_5");
        depth++;
 
        prs_align(ps);
 
-       prs_uint32("num_entries  ", ps, depth, &(sam->num_entries  ));
-       prs_uint32("ptr_entries  ", ps, depth, &(sam->ptr_entries  ));
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-       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++)
+       for (i = 0; i < num_entries; i++)
        {
                prs_grow(ps);
-               sam_io_sam_entry1("", &(sam->sam[i]), ps, depth);
+               sam_io_sam_entry5("", &(sam->sam[i]), ps, depth);
        }
 
-       for (i = 0; i < sam->num_entries; i++)
+       for (i = 0; i < 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,
-                                                        sam->sam[i].hdr_user_desc.buffer,
-                                                        ps, depth);
+               smb_io_string2("grp_name", &(sam->str[i].grp_name),
+                              sam->sam[i].hdr_grp_name.buffer, ps, depth);
        }
 }
 
@@ -1300,25 +1538,23 @@ static void sam_io_sam_info_1(char *desc,  SAM_INFO_1 *sam, prs_struct *ps, int
 makes a SAMR_R_QUERY_DISPINFO structure.
 ********************************************************************/
 void make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
-               uint16 switch_level, SAM_INFO_CTR *ctr, uint32 status)
+                               uint32 num_entries, uint32 data_size,
+                               uint16 switch_level, SAM_DISPINFO_CTR *ctr,
+                               uint32 status)
 {
        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)
-       {
-               r_u->unknown_0 = 0x0000001;
-               r_u->unknown_1 = 0x0000001;
-       }
-       else
-       {
-               r_u->unknown_0 = 0x0;
-               r_u->unknown_1 = 0x0;
-       }
+       r_u->total_size = 0; /* not calculated */
+       r_u->data_size = data_size;
 
        r_u->switch_level = switch_level;
+       r_u->num_entries = num_entries;
+       r_u->ptr_entries = 1;
+       r_u->num_entries2 = num_entries;
        r_u->ctr = ctr;
+
        r_u->status = status;
 }
 
@@ -1326,7 +1562,7 @@ void make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, prs_struct *ps, int depth)
+void samr_io_r_query_dispinfo(char *desc, SAMR_R_QUERY_DISPINFO *r_u, prs_struct *ps, int depth)
 {
        if (r_u == NULL) return;
 
@@ -1335,22 +1571,40 @@ void samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, prs_struc
 
        prs_align(ps);
 
-       prs_uint32("unknown_0    ", ps, depth, &(r_u->unknown_0    ));
-       prs_uint32("unknown_1    ", ps, depth, &(r_u->unknown_1    ));
-       prs_uint16("switch_level ", ps, depth, &(r_u->switch_level ));
-
+       prs_uint32("total_size  ", ps, depth, &(r_u->total_size  ));
+       prs_uint32("data_size   ", ps, depth, &(r_u->data_size   ));
+       prs_uint16("switch_level", ps, depth, &(r_u->switch_level));
        prs_align(ps);
 
+       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));
+
        switch (r_u->switch_level)
        {
                case 0x1:
                {
-                       sam_io_sam_info_1("users", r_u->ctr->sam.info1, ps, depth);
+                       sam_io_sam_dispinfo_1("users", r_u->ctr->sam.info1, r_u->num_entries, ps, depth);
                        break;
                }
                case 0x2:
                {
-                       sam_io_sam_info_2("servers", r_u->ctr->sam.info2, ps, depth);
+                       sam_io_sam_dispinfo_2("servers", r_u->ctr->sam.info2, r_u->num_entries, ps, depth);
+                       break;
+               }
+               case 0x3:
+               {
+                       sam_io_sam_dispinfo_3("groups", r_u->ctr->sam.info3, r_u->num_entries, ps, depth);
+                       break;
+               }
+               case 0x4:
+               {
+                       sam_io_sam_dispinfo_4("user list", r_u->ctr->sam.info4,r_u->num_entries, ps, depth);
+                       break;
+               }
+               case 0x5:
+               {
+                       sam_io_sam_dispinfo_5("group list", r_u->ctr->sam.info5, r_u->num_entries, ps, depth);
                        break;
                }
                default:
@@ -1365,184 +1619,203 @@ 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_uint32("status", ps, depth, &(r_u->status));
+}
 
-       prs_align(ps);
+
+/*******************************************************************
+makes a GROUP_INFO1 structure.
+********************************************************************/
+void make_samr_group_info1(GROUP_INFO1 *gr1,
+                               char *acct_name, char *acct_desc)
+{
+       int desc_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       int acct_len = acct_name != NULL ? strlen(acct_name) : 0;
+       if (gr1 == NULL) return;
+
+       DEBUG(5,("make_samr_group_info1\n"));
+
+       make_uni_hdr(&(gr1->hdr_acct_name), acct_len , acct_len, acct_name ? 1 : 0);
+
+       gr1->unknown_1 = 0x3;
+       gr1->unknown_2 = 0x3;
+
+       make_uni_hdr(&(gr1->hdr_acct_desc), desc_len , desc_len, acct_desc ? 1 : 0);
+
+       make_unistr2(&(gr1->uni_acct_name), acct_name, acct_len);
+       make_unistr2(&(gr1->uni_acct_desc), acct_desc, desc_len);
 }
 
 
 /*******************************************************************
-makes a SAMR_R_ENUM_DOM_GROUPS structure.
+reads or writes a 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 samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int depth)
 {
-       int i;
-       int entries_added;
+       if (gr1 == NULL) return;
 
-       if (r_u == NULL) return;
+       prs_debug(ps, depth, desc, "samr_io_group_info1");
+       depth++;
 
-       DEBUG(5,("make_samr_r_enum_dom_groups\n"));
+       prs_align(ps);
 
-       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));
-       }
+       smb_io_unihdr ("hdr_acct_name", &(gr1->hdr_acct_name) , ps, depth); 
 
-       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);
+       prs_uint32("unknown_1", ps, depth, &(gr1->unknown_1));
+       prs_uint32("unknown_2", ps, depth, &(gr1->unknown_2));
 
-                       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));
+       smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
 
-                       entries_added++;
-               }
+       smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name), gr1->hdr_acct_name.buffer, ps, depth);
+       prs_align(ps);
 
-               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;
-       }
+       smb_io_unistr2("uni_acct_desc", &(gr1->uni_acct_desc), gr1->hdr_acct_desc.buffer, ps, depth);
+}
 
-       r_u->status = status;
+/*******************************************************************
+makes a GROUP_INFO4 structure.
+********************************************************************/
+void make_samr_group_info4(GROUP_INFO4 *gr4, const char *acct_desc)
+{
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       if (gr4 == NULL) return;
+
+       DEBUG(5,("make_samr_group_info4\n"));
+
+       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_r_enum_dom_groups(char *desc,  SAMR_R_ENUM_DOM_GROUPS *r_u, prs_struct *ps, int depth)
+void samr_io_group_info4(char *desc,  GROUP_INFO4 *gr4, prs_struct *ps, int depth)
 {
-       int i;
-
-       if (r_u == NULL) return;
+       if (gr4 == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
+       prs_debug(ps, depth, desc, "samr_io_group_info4");
        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 ));
+       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);
+}
 
-       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  ));
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int depth)
+{
+       if (ctr == NULL) return;
 
-               prs_uint32("num_entries2 ", ps, depth, &(r_u->num_entries2 ));
+       prs_debug(ps, depth, desc, "samr_group_info_ctr");
+       depth++;
 
-               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+       prs_uint16("switch_value1", ps, depth, &(ctr->switch_value1));
+       prs_uint16("switch_value2", ps, depth, &(ctr->switch_value2));
 
-               for (i = 0; i < r_u->num_entries; i++)
+       switch (ctr->switch_value1)
+       {
+               case 1:
                {
-                       prs_grow(ps);
-                       sam_io_sam_entry3("", &(r_u->sam[i]), ps, depth);
+                       samr_io_group_info1("group_info1", &(ctr->group.info1), ps, depth);
+                       break;
                }
-
-               for (i = 0; i < r_u->num_entries; i++)
+               case 4:
                {
-                       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);
+                       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_uint32("status", ps, depth, &(r_u->status));
+       prs_align(ps);
 }
 
 
 /*******************************************************************
-makes a SAMR_Q_QUERY_ALIASINFO structure.
+makes a SAMR_Q_CREATE_DOM_GROUP structure.
 ********************************************************************/
-void make_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_e,
+void make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_e,
                                POLICY_HND *pol,
-                               uint16 switch_level)
+                               const char *acct_desc)
 {
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
        if (q_e == NULL || pol == NULL) return;
 
-       DEBUG(5,("make_q_query_aliasinfo\n"));
+       DEBUG(5,("make_samr_q_create_dom_group\n"));
 
        memcpy(&(q_e->pol), pol, sizeof(*pol));
 
-       q_e->switch_level = switch_level;
+       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_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_struct *ps, int depth)
+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_query_aliasinfo");
+       prs_debug(ps, depth, desc, "samr_io_q_create_dom_group");
        depth++;
 
        prs_align(ps);
@@ -1550,49 +1823,28 @@ void samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_str
        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", &(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_QUERY_ALIASINFO structure.
+makes a SAMR_R_CREATE_DOM_GROUP structure.
 ********************************************************************/
-void make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u,
-               uint16 switch_value, char *acct_desc,
-               uint32 status)
+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_query_aliasinfo\n"));
-
-       r_u->ptr = 0;
-
-       if (status == 0)
-       {
-               r_u->switch_value = switch_value;
-
-               switch (switch_value)
-               {
-                       case 3:
-                       {
-                               int acct_len = acct_desc ? strlen(acct_desc) : 0;
-
-                               r_u->ptr = 1;
-
-                               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);
-
-                               break;
-                       }
+       DEBUG(5,("make_samr_r_create_dom_group\n"));
 
-                       default:
-                       {
-                               DEBUG(4,("make_samr_r_query_aliasinfo: unsupported switch level\n"));
-                               break;
-                       }
-               }
-       }
+       memcpy(&(r_u->pol), pol, sizeof(*pol));
 
+       r_u->rid    = rid   ;
        r_u->status = status;
 }
 
@@ -1600,67 +1852,1048 @@ 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_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_query_aliasinfo");
+       prs_debug(ps, depth, desc, "samr_io_r_create_dom_group");
        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;
-                               }
-                       }
-               }
-       }
-
+       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));
 }
 
 /*******************************************************************
-reads or writes a SAMR_Q_LOOKUP_IDS structure.
+makes a SAMR_Q_DELETE_DOM_GROUP structure.
 ********************************************************************/
-void samr_io_q_lookup_ids(char *desc,  SAMR_Q_LOOKUP_IDS *q_u, prs_struct *ps, int depth)
+void make_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP *q_c, POLICY_HND *hnd)
 {
-       fstring tmp;
-       int i;
+       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_lookup_ids");
+       prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
-       prs_align(ps);
+       smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
+}
 
-       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));
+/*******************************************************************
+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_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_GROUPS structure.
+********************************************************************/
+void make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e, POLICY_HND *pol, 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->unknown_0 = 0;
+       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_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_GROUPS structure.
+********************************************************************/
+void make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
+               uint32 num_sam_entries, DOMAIN_GRP *grps,
+               uint32 status)
+{
+       int i;
+
+       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));
+       }
+
+       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(grps[i].name);
+
+                       make_sam_entry(&(r_u->sam[i]),
+                                       acct_name_len,
+                                       grps[i].rid);
+
+                       make_unistr2(&(r_u->uni_grp_name[i]), grps[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_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("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 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 = (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);
 
@@ -1685,34 +2918,219 @@ void samr_io_q_lookup_ids(char *desc,  SAMR_Q_LOOKUP_IDS *q_u, prs_struct *ps, i
 
 
 /*******************************************************************
-makes a SAMR_R_LOOKUP_IDS structure.
+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_ids(SAMR_R_LOOKUP_IDS *r_u,
-               uint32 num_rids, uint32 *rid, uint32 status)
+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) return;
+       if (r_u == NULL || name == NULL || type == NULL) return;
 
-       DEBUG(5,("make_samr_r_lookup_ids\n"));
+       DEBUG(5,("make_samr_r_lookup_rids\n"));
 
        if (status == 0x0)
        {
-               r_u->num_entries  = num_rids;
-               r_u->ptr = 1;
-               r_u->num_entries2 = num_rids;
+               r_u->num_names1 = num_names;
+               r_u->ptr_names  = 1;
+               r_u->num_names2 = num_names;
 
-               SMB_ASSERT_ARRAY(r_u->rid, num_rids);
+               r_u->num_types1 = num_names;
+               r_u->ptr_types  = 1;
+               r_u->num_types2 = num_names;
 
-               for (i = 0; i < num_rids; i++)
+               SMB_ASSERT_ARRAY(r_u->hdr_name, num_names);
+
+               for (i = 0; i < num_names; i++)
                {
-                       r_u->rid[i] = rid[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_entries  = 0;
-               r_u->ptr = 0;
-               r_u->num_entries2 = 0;
+               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;
@@ -1721,106 +3139,379 @@ void make_samr_r_lookup_ids(SAMR_R_LOOKUP_IDS *r_u,
 /*******************************************************************
 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_lookup_rids(char *desc,  SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth)
 {
-       fstring tmp;
        int i;
+       fstring tmp;
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_lookup_ids");
+       prs_debug(ps, depth, desc, "samr_io_r_lookup_rids");
        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("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->num_entries != 0)
+       if (r_u->ptr_names != 0 && r_u->num_names1 != 0)
        {
-               SMB_ASSERT_ARRAY(r_u->rid, r_u->num_entries2);
+               SMB_ASSERT_ARRAY(r_u->hdr_name, r_u->num_names2);
 
-               for (i = 0; i < r_u->num_entries2; i++)
+               for (i = 0; i < r_u->num_names2; i++)
                {
-                       slprintf(tmp, sizeof(tmp)-1, "rid[%02d]", i);
-                       prs_uint32(tmp, ps, depth, &(r_u->rid[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_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth)
+void samr_io_q_delete_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_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;
 
-       prs_debug(ps, depth, desc, "samr_io_q_lookup_names");
+       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;
+}
+
+
+/*******************************************************************
+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;
+
+       prs_debug(ps, depth, desc, "samr_io_q_create_dom_alias");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+       smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth); 
+
+       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);
+
+       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;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+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_create_dom_alias");
+       depth++;
+
        prs_align(ps);
 
-       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));
+       smb_io_pol_hnd("alias_pol", &(r_u->alias_pol), ps, depth); 
+       prs_uint32("rid", ps, depth, &(r_u->rid));
 
-       SMB_ASSERT_ARRAY(q_u->hdr_user_name, q_u->num_rids2);
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
 
-       for (i = 0; i < q_u->num_rids2; i++)
-       {
-               prs_grow(ps);
-               smb_io_unihdr ("", &(q_u->hdr_user_name[i]), ps, depth); 
-       }
-       for (i = 0; i < q_u->num_rids2; i++)
-       {
-               prs_grow(ps);
-               smb_io_unistr2("", &(q_u->uni_user_name[i]), q_u->hdr_user_name[i].buffer, ps, depth); 
-       }
+
+
+/*******************************************************************
+makes a SAMR_Q_ADD_ALIASMEM structure.
+********************************************************************/
+void make_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM *q_u, POLICY_HND *hnd,
+                               DOM_SID *sid)
+{
+       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_add_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_add_aliasmem(char *desc,  SAMR_R_ADD_ALIASMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       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_Q_DEL_ALIASMEM structure.
+********************************************************************/
+void make_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM *q_u, POLICY_HND *hnd,
+                               DOM_SID *sid)
+{
+       if (q_u == NULL) return;
+
+       DEBUG(5,("make_samr_q_del_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_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_del_aliasmem(char *desc,  SAMR_R_DEL_ALIASMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_del_aliasmem");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+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;
+
+       DEBUG(5,("make_samr_q_delete_dom_alias\n"));
+
+       memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_delete_dom_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_dom_alias");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+}
+
+/*******************************************************************
+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;
+
+       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_Q_QUERY_ALIASMEM structure.
+********************************************************************/
+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_LOOKUP_NAMES structure.
+makes a SAMR_R_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_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;
-
-               SMB_ASSERT_ARRAY(r_u->dom_rid, num_rids);
-
-               for (i = 0; i < num_rids; i++)
-               {
-                       make_dom_rid3(&(r_u->dom_rid[i]), rid[i], 0x01);
-               }
+               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;
@@ -1829,48 +3520,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)
        {
-               SMB_ASSERT_ARRAY(r_u->dom_rid, r_u->num_entries2);
+               SMB_ASSERT_ARRAY(ptr_sid, r_u->num_sids);
 
-               for (i = 0; i < r_u->num_entries2; i++)
+               if (r_u->num_sids != 0)
                {
-                       prs_grow(ps);
-                       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("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_LOOKUP_NAMES structure.
+********************************************************************/
+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;
 
-       prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
+       DEBUG(5,("make_samr_q_lookup_names\n"));
 
-       prs_uint32("status", ps, depth, &(r_u->status));
+       memcpy(&(q_u->pol), pol, sizeof(*pol));
+
+       q_u->num_names1 = num_names;
+       q_u->flags     = flags;
+       q_u->ptr       = 0;
+       q_u->num_names2 = num_names;
+
+       for (i = 0; i < num_names; i++)
+       {
+               int len_name = name[i] != NULL ? strlen(name[i]) : 0;
+               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);
@@ -1878,18 +3607,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));
 
-       SMB_ASSERT_ARRAY(q_u->gid, q_u->num_gids2);
+       SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2);
 
-       for (i = 0; i < q_u->num_gids2; i++)
+       for (i = 0; i < q_u->num_names2; i++)
        {
                prs_grow(ps);
-               slprintf(tmp, sizeof(tmp) - 1, "gid[%02d]  ", i);
-               prs_uint32(tmp, ps, depth, &(q_u->gid[i]));
+               smb_io_unihdr ("", &(q_u->hdr_name[i]), ps, depth); 
+       }
+       for (i = 0; i < q_u->num_names2; i++)
+       {
+               prs_grow(ps);
+               smb_io_unistr2("", &(q_u->uni_name[i]), q_u->hdr_name[i].buffer, ps, depth); 
        }
 
        prs_align(ps);
@@ -1897,46 +3630,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;
 
-               SMB_ASSERT_ARRAY(r_u->hdr_als_name, num_aliases);
+               SMB_ASSERT_ARRAY(r_u->rid, num_rids);
 
-               for (i = 0; i < num_aliases; i++)
+               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;
@@ -1945,54 +3675,43 @@ 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 ));
+       prs_uint32("num_rids2", ps, depth, &(r_u->num_rids2));
 
-       if (r_u->ptr_aliases != 0 && r_u->num_aliases1 != 0)
+       if (r_u->ptr_rids != 0 && r_u->num_rids1 != 0)
        {
-               SMB_ASSERT_ARRAY(r_u->hdr_als_name, r_u->num_aliases2);
-
-               for (i = 0; i < r_u->num_aliases2; i++)
-               {
-                       prs_grow(ps);
-                       slprintf(tmp, sizeof(tmp) - 1, "als_hdr[%02d]  ", i);
-                       smb_io_unihdr ("", &(r_u->hdr_als_name[i]), ps, depth); 
-               }
-               for (i = 0; i < r_u->num_aliases2; i++)
+               for (i = 0; i < r_u->num_rids2; i++)
                {
                        prs_grow(ps);
-                       slprintf(tmp, sizeof(tmp) - 1, "als_str[%02d]  ", i);
-                       smb_io_unistr2("", &(r_u->uni_als_name[i]), r_u->hdr_als_name[i].buffer, ps, depth); 
+                       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 ));
+       prs_uint32("num_types2", ps, depth, &(r_u->num_types2));
 
-       if (r_u->ptr_als_usrs != 0 && r_u->num_als_usrs1 != 0)
+       if (r_u->ptr_types != 0 && r_u->num_types1 != 0)
        {
-               SMB_ASSERT_ARRAY(r_u->num_als_usrs, r_u->num_als_usrs2);
-
-               for (i = 0; i < r_u->num_als_usrs2; i++)
+               for (i = 0; i < r_u->num_types2; i++)
                {
                        prs_grow(ps);
-                       slprintf(tmp, sizeof(tmp) - 1, "als_usrs[%02d]  ", i);
-                       prs_uint32(tmp, ps, depth, &(r_u->num_als_usrs[i]));
+                       slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
+                       prs_uint32(tmp, ps, depth, &(r_u->type[i]));
                }
        }
 
@@ -2009,7 +3728,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));
        
@@ -2056,99 +3775,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;
-       }
-       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_QUERY_USERINFO structure.
 ********************************************************************/
@@ -2282,8 +3908,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 */
 }
 
 /*******************************************************************
@@ -2332,6 +3956,7 @@ void sam_io_user_info11(char *desc,  SAM_USER_INFO_11 *usr, prs_struct *ps, int
 
        prs_uint8s (False, "padding_9", ps, depth, usr->padding_9, sizeof(usr->padding_9));
 }
+
 /*************************************************************************
  make_sam_user_info21
 
@@ -2554,7 +4179,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;
                        }
                }
@@ -2690,7 +4315,7 @@ 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 */
        q_u->ptr_srv_name = len_srv_name > 0 ? 1 : 0; 
@@ -2746,7 +4371,7 @@ void make_samr_q_connect_anon(SAMR_Q_CONNECT_ANON *q_u)
 {
        if (q_u == NULL) return;
 
-       DEBUG(5,("make_q_connect_anon\n"));
+       DEBUG(5,("make_samr_q_connect_anon\n"));
 
        q_u->ptr       = 1;
        q_u->unknown_0 = 0x5c; /* server name (?!!) */
@@ -2791,114 +4416,6 @@ void samr_io_r_connect_anon(char *desc,  SAMR_R_CONNECT_ANON *r_u, prs_struct *p
        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,
-                               uint32 unknown_0, uint32 rid)
-{
-       if (q_u == NULL) return;
-
-       DEBUG(5,("make_q_open_alias\n"));
-
-       /* 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);
-
-       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_UNKNOWN_12 structure.
-********************************************************************/
-void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
-               POLICY_HND *pol, uint32 rid,
-               uint32 num_gids, uint32 *gid)
-{
-       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_gids1 = num_gids;
-       q_u->rid       = rid;
-       q_u->ptr       = 0;
-       q_u->num_gids2 = num_gids;
-
-       for (i = 0; i < num_gids; i++)
-       {
-               q_u->gid[i] = gid[i];
-       }
-}
-
-
-/*******************************************************************
-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;
-}
-
-
-/*******************************************************************
-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;
-}
-
-
 /*******************************************************************
 makes a SAMR_Q_UNKNOWN_38 structure.
 ********************************************************************/
@@ -2908,7 +4425,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);
@@ -2981,7 +4498,7 @@ 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)); 
+       memcpy(pwd->pass, pass, sizeof(pwd->pass)); 
 }
 
 /*******************************************************************
@@ -3008,7 +4525,7 @@ 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));
+       memcpy(hsh->hash, hash, sizeof(hsh->hash));
 }
 
 /*******************************************************************