added SAMR_USER_INFO_24 info level to samr_set_userinfo. this is used
[samba.git] / source3 / rpc_parse / parse_samr.c
index fb9392501133fc5f3854ea5e71b52a5def7657da..09c881a812f7e11630994a350b477ab3bf17ca26 100644 (file)
@@ -73,6 +73,66 @@ 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);
+       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.
@@ -258,6 +318,7 @@ void samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_st
        prs_align(ps);
 }
 
+
 /*******************************************************************
 makes a structure.
 ********************************************************************/
@@ -328,8 +389,8 @@ void make_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
        u_2->unknown_2 = 0x00000000;
 
        u_2->ptr_0 = 1;
-       make_uni_hdr(&(u_2->hdr_domain), len_domain, len_domain, 1);
-       make_uni_hdr(&(u_2->hdr_server), len_server, len_server, 1);
+       make_uni_hdr(&(u_2->hdr_domain), len_domain);
+       make_uni_hdr(&(u_2->hdr_server), len_server);
 
        u_2->seq_num = 0x10000000;
        u_2->unknown_3 = 0x00000000;
@@ -337,9 +398,9 @@ void make_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
        u_2->unknown_4  = 0x00000001;
        u_2->unknown_5  = 0x00000003;
        u_2->unknown_6  = 0x00000001;
-       u_2->num_domain_usrs  = 0x00000008;
-       u_2->num_domain_grps = 0x00000003;
-       u_2->num_local_grps = 0x00000003;
+       u_2->num_domain_usrs  = MAX_SAM_ENTRIES;
+       u_2->num_domain_grps = MAX_SAM_ENTRIES;
+       u_2->num_local_grps = MAX_SAM_ENTRIES;
 
        memset(u_2->padding, 0, sizeof(u_2->padding)); /* 12 bytes zeros */
 
@@ -388,6 +449,38 @@ void sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 *u_2, prs_struct *ps, int depth
 
 }
 
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_unk_info1(SAM_UNK_INFO_1 *u_1)
+{
+       if (u_1 == NULL) return;
+
+       memset(u_1->padding, 0, sizeof(u_1->padding)); /* 12 bytes zeros */
+       u_1->unknown_1 = 0x80000000;
+       u_1->unknown_2 = 0x00000000;
+       u_1->unknown_3 = 0x00000000;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 *u_1, prs_struct *ps, int depth)
+{
+       if (u_1 == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_unk_info1");
+       depth++;
+
+       prs_uint8s(False, "padding", ps, depth, u_1->padding, sizeof(u_1->padding)); /* 12 bytes zeros */
+
+       prs_uint32("unknown_1", ps, depth, &u_1->unknown_1); /* 0x8000 0000 */
+       prs_uint32("unknown_2", ps, depth, &u_1->unknown_2); /* 0x0000 0000 */
+       prs_uint32("unknown_3", ps, depth, &u_1->unknown_3); /* 0x0000 0000 */
+
+       prs_align(ps);
+}
+
 /*******************************************************************
 makes a SAMR_R_QUERY_DOMAIN_INFO structure.
 ********************************************************************/
@@ -446,6 +539,11 @@ void samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_str
                                sam_io_unk_info2("unk_inf2", &r_u->ctr->info.inf2, ps, depth);
                                break;
                        }
+                       case 0x01:
+                       {
+                               sam_io_unk_info1("unk_inf1", &r_u->ctr->info.inf1, ps, depth);
+                               break;
+                       }
                        default:
                        {
                                DEBUG(3,("samr_io_r_query_dom_info: unknown switch level 0x%x\n",
@@ -697,9 +795,9 @@ static void make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
        sam->acb_info = acb_info;
        sam->pad      = 0;
 
-       make_uni_hdr(&(sam->hdr_acct_name), len_sam_name, len_sam_name, len_sam_name != 0);
-       make_uni_hdr(&(sam->hdr_user_name), len_sam_full, len_sam_full, len_sam_full != 0);
-       make_uni_hdr(&(sam->hdr_user_desc), len_sam_desc, len_sam_desc, len_sam_desc != 0);
+       make_uni_hdr(&(sam->hdr_acct_name), len_sam_name);
+       make_uni_hdr(&(sam->hdr_user_name), len_sam_full);
+       make_uni_hdr(&(sam->hdr_user_desc), len_sam_desc);
 }
 
 /*******************************************************************
@@ -757,8 +855,8 @@ static void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx,
        sam->acb_info = acb_info;
        sam->pad      = 0;
 
-       make_uni_hdr(&(sam->hdr_srv_name), len_sam_name, len_sam_name, len_sam_name != 0);
-       make_uni_hdr(&(sam->hdr_srv_desc), len_sam_desc, len_sam_desc, len_sam_desc != 0);
+       make_uni_hdr(&(sam->hdr_srv_name), len_sam_name);
+       make_uni_hdr(&(sam->hdr_srv_desc), len_sam_desc);
 }
 
 /*******************************************************************
@@ -813,8 +911,8 @@ static void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx,
        sam->rid_grp = rid_grp;
        sam->attr    = 0x07; /* group rid attributes - gets ignored by nt 4.0 */
 
-       make_uni_hdr(&(sam->hdr_grp_name), len_grp_name, len_grp_name, len_grp_name != 0);
-       make_uni_hdr(&(sam->hdr_grp_desc), len_grp_desc, len_grp_desc, len_grp_desc != 0);
+       make_uni_hdr(&(sam->hdr_grp_name), len_grp_name);
+       make_uni_hdr(&(sam->hdr_grp_desc), len_grp_desc);
 }
 
 /*******************************************************************
@@ -838,6 +936,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.
 ********************************************************************/
@@ -848,7 +1008,7 @@ static void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
        DEBUG(5,("make_sam_entry\n"));
 
        sam->rid = rid;
-       make_uni_hdr(&(sam->hdr_name), len_sam_name, len_sam_name, len_sam_name != 0);
+       make_uni_hdr(&(sam->hdr_name), len_sam_name);
 }
 
 /*******************************************************************
@@ -924,14 +1084,9 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
 
        DEBUG(5,("make_samr_r_enum_dom_users\n"));
 
-       if (num_sam_entries >= MAX_SAM_ENTRIES)
-       {
-               num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d\n",
-                        num_sam_entries));
-       }
-
        r_u->next_idx = next_idx;
+       r_u->sam = NULL;
+       r_u->uni_acct_name = NULL;
 
        if (num_sam_entries != 0)
        {
@@ -940,8 +1095,14 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
                r_u->num_entries2 = num_sam_entries;
                r_u->num_entries3 = num_sam_entries;
 
-               SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries);
-               SMB_ASSERT_ARRAY(r_u->uni_acct_name, num_sam_entries);
+               r_u->sam = Realloc(NULL, r_u->num_entries2 * sizeof(r_u->sam[0]));
+               r_u->uni_acct_name = Realloc(NULL, r_u->num_entries2 * sizeof(r_u->uni_acct_name[0]));
+
+               if (r_u->sam == NULL || r_u->uni_acct_name == NULL)
+               {
+                       DEBUG(0,("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
+                       return;
+               }
 
                for (i = 0; i < num_sam_entries; i++)
                {
@@ -987,7 +1148,17 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
                prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2));
                prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
 
-               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries2);
+               if (ps->io)
+               {
+                       r_u->sam = Realloc(NULL, r_u->num_entries2 * sizeof(r_u->sam[0]));
+                       r_u->uni_acct_name = Realloc(NULL, r_u->num_entries2 * sizeof(r_u->uni_acct_name[0]));
+               }
+
+               if ((r_u->sam == NULL || r_u->uni_acct_name == NULL) && r_u->num_entries2 != 0)
+               {
+                       DEBUG(0,("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
+                       return;
+               }
 
                for (i = 0; i < r_u->num_entries2; i++)
                {
@@ -995,8 +1166,6 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
                        sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
                }
 
-               SMB_ASSERT_ARRAY(r_u->uni_acct_name, r_u->num_entries2);
-
                for (i = 0; i < r_u->num_entries2; i++)
                {
                        prs_grow(ps);
@@ -1005,9 +1174,9 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 
                prs_align(ps);
 
-               prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
        }
 
+       prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
@@ -1015,20 +1184,20 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 makes a SAMR_Q_QUERY_DISPINFO structure.
 ********************************************************************/
 void make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
-                               uint16 switch_level, uint32 start_idx, uint32 size)
+                               uint16 switch_level, uint32 start_idx,
+                               uint32 max_entries)
 {
        if (q_e == NULL || pol == NULL) return;
 
        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->switch_level = switch_level;
 
-       q_e->unknown_0 = 0;
        q_e->start_idx = start_idx;
-       q_e->unknown_1 = 0x000007d0;
-       q_e->max_size  = size;
+       q_e->max_entries = max_entries;
+       q_e->max_size = 0xffff; /* Not especially useful */
 }
 
 /*******************************************************************
@@ -1043,325 +1212,530 @@ void samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struc
 
        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_uint16("switch_level", ps, depth, &(q_e->switch_level));
-       prs_uint16("unknown_0   ", ps, depth, &(q_e->unknown_0   ));
+       prs_align(ps);
+
        prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
-       prs_uint32("unknown_1   ", ps, depth, &(q_e->unknown_1   ));
+       prs_uint32("max_entries ", ps, depth, &(q_e->max_entries ));
        prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
-
-       prs_align(ps);
 }
 
 
 /*******************************************************************
-makes a SAM_INFO_2 structure.
+makes a SAM_DISPINFO_1 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_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;
-       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_1\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 = 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;
 
-                       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_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);
 
-                       entries_added++;
-               }
+               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));
 
-               sam->num_entries   = entries_added;
-               sam->ptr_entries   = 1;
-               sam->num_entries2  = entries_added;
+               dsize += sizeof(SAM_ENTRY1);
+               dsize += len_sam_name + len_sam_full + len_sam_desc;
        }
+
+       *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_1(char *desc, SAM_DISPINFO_1 *sam, uint32 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_1");
        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, num_entries);
 
-       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_entry2("", &(sam->sam[i]), ps, depth);
+               sam_io_sam_entry1("", &(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_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 SAM_INFO_1 structure.
+makes a SAM_DISPINFO_2 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_2(SAM_DISPINFO_2 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
+       uint32 len_sam_name, len_sam_desc;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
        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_2\n"));
 
-       if (num_sam_entries >= MAX_SAM_ENTRIES)
-       {
-               num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d\n", 
-                        num_sam_entries));
-       }
+       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_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++;
-               }
+               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;
        }
 
-       sam->num_entries   = entries_added;
-       sam->ptr_entries   = 1;
-       sam->num_entries2  = entries_added;
+       *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_2(char *desc, SAM_DISPINFO_2 *sam, uint32 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_2");
        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_entry1("", &(sam->sam[i]), ps, depth);
+               sam_io_sam_entry2("", &(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);
+               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 SAMR_R_QUERY_DISPINFO structure.
+makes a SAM_DISPINFO_3 structure.
 ********************************************************************/
-void make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
-               uint16 switch_level, SAM_INFO_CTR *ctr, uint32 status)
+void make_sam_dispinfo_3(SAM_DISPINFO_3 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        DOMAIN_GRP *grp)
 {
-       if (r_u == NULL) return;
+       uint32 len_sam_name, len_sam_desc;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
+       int i;
 
-       DEBUG(5,("make_samr_r_query_dispinfo: level %d\n", switch_level));
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
 
-       if (status == 0x0)
-       {
-               r_u->unknown_0 = 0x0000001;
-               r_u->unknown_1 = 0x0000001;
-       }
-       else
+       DEBUG(5,("make_sam_dispinfo_3\n"));
+
+       max_entries = *num_entries;
+       max_data_size = *data_size;
+
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
        {
-               r_u->unknown_0 = 0x0;
-               r_u->unknown_1 = 0x0;
+               len_sam_name = strlen(grp[i].name);
+               len_sam_desc = strlen(grp[i].comment);
+
+               make_sam_entry3(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name, len_sam_desc,
+                               grp[i].rid);
+
+               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);
+
+               dsize += sizeof(SAM_ENTRY3);
+               dsize += (len_sam_name + len_sam_desc) * 2;
        }
 
-       r_u->switch_level = switch_level;
-       r_u->ctr = ctr;
-       r_u->status = status;
+       *num_entries = i;
+        *data_size = dsize;
 }
 
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_query_dispinfo(char *desc,  SAMR_R_QUERY_DISPINFO *r_u, 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)
 {
-       if (r_u == NULL) return;
+       int i;
 
-       prs_debug(ps, depth, desc, "samr_io_r_query_dispinfo");
+       if (sam == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_3");
        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_uint16("switch_level ", ps, depth, &(r_u->switch_level ));
-
-       prs_align(ps);
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-       switch (r_u->switch_level)
+       for (i = 0; i < num_entries; i++)
        {
-               case 0x1:
-               {
-                       sam_io_sam_info_1("users", r_u->ctr->sam.info1, ps, depth);
-                       break;
-               }
-               case 0x2:
-               {
-                       sam_io_sam_info_2("servers", r_u->ctr->sam.info2, ps, depth);
-                       break;
-               }
-               default:
-               {
-                       DEBUG(5,("samr_io_r_query_dispinfo: unknown switch value\n"));
-                       break;
-               }
+               prs_grow(ps);
+               sam_io_sam_entry3("", &(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_str3 ("", &(sam->str[i]),
+                                sam->sam[i].hdr_grp_name.buffer,
+                                sam->sam[i].hdr_grp_desc.buffer,
+                                ps, depth);
+       }
 }
 
 
 /*******************************************************************
-makes a SAMR_Q_OPEN_GROUP structure.
+makes a SAM_DISPINFO_4 structure.
 ********************************************************************/
-void make_samr_q_open_group(SAMR_Q_OPEN_GROUP *q_c,
-                               POLICY_HND *hnd, uint32 unk, uint32 rid)
+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])
 {
-       if (q_c == NULL || hnd == NULL) return;
+       fstring sam_name;
+       uint32 len_sam_name;
+       uint32 max_entries, max_data_size;
+       uint32 dsize = 0;
+       int i;
 
-       DEBUG(5,("make_samr_q_open_group\n"));
+       if (sam == NULL || num_entries == NULL || data_size == NULL) return;
 
-       memcpy(&(q_c->domain_pol), hnd, sizeof(q_c->domain_pol));
-       q_c->unknown = unk;
-       q_c->rid_group = rid;
-}
+       DEBUG(5,("make_sam_dispinfo_4\n"));
 
-/*******************************************************************
-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;
+       max_entries = *num_entries;
+       max_data_size = *data_size;
 
-       prs_debug(ps, depth, desc, "samr_io_q_open_group");
-       depth++;
+       for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
+       {
+               len_sam_name = pass[i].uni_user_name.uni_str_len;
 
-       prs_align(ps);
+               make_sam_entry4(&(sam->sam[i]), start_idx + i + 1,
+                               len_sam_name);
 
-       smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+               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);
 
-       prs_uint32("unknown  ", ps, depth, &(q_u->unknown  ));
-       prs_uint32("rid_group", ps, depth, &(q_u->rid_group));
+               dsize += sizeof(SAM_ENTRY4);
+               dsize += len_sam_name;
+       }
+
+       *num_entries = i;
+        *data_size = dsize;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_open_group(char *desc,  SAMR_R_OPEN_GROUP *r_u, prs_struct *ps, int depth)
+static void sam_io_sam_dispinfo_4(char *desc, SAM_DISPINFO_4 *sam, int num_entries, prs_struct *ps, int depth)
 {
-       if (r_u == NULL) return;
+       int i;
 
-       prs_debug(ps, depth, desc, "samr_io_r_open_group");
+       if (sam == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_4");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
-       prs_align(ps);
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
 
-       prs_uint32("status", ps, depth, &(r_u->status));
+       for (i = 0; i < num_entries; i++)
+       {
+               prs_grow(ps);
+               sam_io_sam_entry4("", &(sam->sam[i]), ps, depth);
+       }
+
+       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 GROUP_INFO1 structure.
+makes a SAM_DISPINFO_5 structure.
 ********************************************************************/
-void make_samr_group_info1(GROUP_INFO1 *gr1,
-                               char *acct_name, char *acct_desc)
+void make_sam_dispinfo_5(SAM_DISPINFO_5 *sam, uint32 *num_entries,
+                        uint32 *data_size, uint32 start_idx,
+                        DOMAIN_GRP *grp)
 {
-       int desc_len = acct_desc != NULL ? strlen(acct_desc) : 0;
-       int acct_len = acct_name != NULL ? strlen(acct_name) : 0;
-       if (gr1 == NULL) return;
+       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_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_dispinfo_5");
+       depth++;
+
+       prs_align(ps);
+
+       SMB_ASSERT_ARRAY(sam->sam, num_entries);
+
+       for (i = 0; i < num_entries; i++)
+       {
+               prs_grow(ps);
+               sam_io_sam_entry5("", &(sam->sam[i]), ps, depth);
+       }
+
+       for (i = 0; i < num_entries; i++)
+       {
+               prs_grow(ps);
+               smb_io_string2("grp_name", &(sam->str[i].grp_name),
+                              sam->sam[i].hdr_grp_name.buffer, ps, depth);
+       }
+}
+
+
+/*******************************************************************
+makes a SAMR_R_QUERY_DISPINFO structure.
+********************************************************************/
+void make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
+                               uint32 num_entries, uint32 data_size,
+                               uint16 switch_level, SAM_DISPINFO_CTR *ctr,
+                               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_query_dispinfo: level %d\n", switch_level));
+
+       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;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_query_dispinfo(char *desc, SAMR_R_QUERY_DISPINFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_query_dispinfo");
+       depth++;
+
+       prs_align(ps);
+
+       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_dispinfo_1("users", r_u->ctr->sam.info1, r_u->num_entries, ps, depth);
+                       break;
+               }
+               case 0x2:
+               {
+                       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:
+               {
+                       DEBUG(5,("samr_io_r_query_dispinfo: unknown switch value\n"));
+                       break;
+               }
+       }
+
+       prs_align(ps);
+       prs_align(ps);
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_OPEN_GROUP structure.
+********************************************************************/
+void make_samr_q_open_group(SAMR_Q_OPEN_GROUP *q_c,
+                               POLICY_HND *hnd, uint32 unk, uint32 rid)
+{
+       if (q_c == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_open_group\n"));
+
+       memcpy(&(q_c->domain_pol), hnd, sizeof(q_c->domain_pol));
+       q_c->unknown = unk;
+       q_c->rid_group = rid;
+}
+
+/*******************************************************************
+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;
+
+       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_r_open_group(char *desc,  SAMR_R_OPEN_GROUP *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_open_group");
+       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 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);
+       make_uni_hdr(&(gr1->hdr_acct_name), acct_len);
 
        gr1->unknown_1 = 0x3;
        gr1->unknown_2 = 0x3;
 
-       make_uni_hdr(&(gr1->hdr_acct_desc), desc_len , desc_len, acct_desc ? 1 : 0);
+       make_uni_hdr(&(gr1->hdr_acct_desc), desc_len);
 
        make_unistr2(&(gr1->uni_acct_name), acct_name, acct_len);
        make_unistr2(&(gr1->uni_acct_desc), acct_desc, desc_len);
@@ -1403,7 +1777,7 @@ void make_samr_group_info4(GROUP_INFO4 *gr4, const char *acct_desc)
 
        DEBUG(5,("make_samr_group_info4\n"));
 
-       make_uni_hdr(&(gr4->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_uni_hdr(&(gr4->hdr_acct_desc), acct_len);
        make_unistr2(&(gr4->uni_acct_desc), acct_desc, acct_len);
 }
 
@@ -1474,7 +1848,7 @@ void make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_e,
 
        memcpy(&(q_e->pol), pol, sizeof(*pol));
 
-       make_uni_hdr(&(q_e->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_uni_hdr(&(q_e->hdr_acct_desc), acct_len);
        make_unistr2(&(q_e->uni_acct_desc), acct_desc, acct_len);
 
        q_e->unknown_1 = 0x0002;
@@ -1979,110 +2353,59 @@ void samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struc
 
 
 /*******************************************************************
-makes a SAMR_Q_ENUM_DOM_GROUPS structure.
+makes a SAMR_Q_QUERY_USERGROUPS 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_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
+                               POLICY_HND *hnd)
 {
-       if (q_e == NULL || pol == NULL) return;
-
-       DEBUG(5,("make_samr_q_enum_dom_groups\n"));
-
-       memcpy(&(q_e->pol), pol, sizeof(*pol));
+       if (q_u == NULL || hnd == NULL) return;
 
-       q_e->switch_level = switch_level;
+       DEBUG(5,("make_samr_q_query_usergroups\n"));
 
-       q_e->unknown_0 = 0;
-       q_e->start_idx = start_idx;
-       q_e->unknown_1 = 0x000007d0;
-       q_e->max_size  = size;
+       memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
 }
 
 
 /*******************************************************************
 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_q_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_struct *ps, int depth)
 {
-       if (q_e == NULL) return;
+       if (q_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
+       prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
-       prs_align(ps);
-
-       prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
-       prs_uint16("unknown_0   ", ps, depth, &(q_e->unknown_0   ));
-       prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
-       prs_uint32("unknown_1   ", ps, depth, &(q_e->unknown_1   ));
-       prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
-
+       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
        prs_align(ps);
 }
 
-
 /*******************************************************************
-makes a SAMR_R_ENUM_DOM_GROUPS structure.
+makes a SAMR_R_QUERY_USERGROUPS structure.
 ********************************************************************/
-void make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
-               uint32 start_idx, uint32 num_sam_entries,
-               DOMAIN_GRP *grp,
-               uint32 status)
+void make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
+               uint32 num_gids, DOM_GID *gid, uint32 status)
 {
-       int i;
-       int entries_added;
-
        if (r_u == NULL) return;
 
-       DEBUG(5,("make_samr_r_enum_dom_groups\n"));
-
-       if (num_sam_entries >= MAX_SAM_ENTRIES)
-       {
-               num_sam_entries = MAX_SAM_ENTRIES;
-               DEBUG(5,("limiting number of entries to %d\n", 
-                        num_sam_entries));
-       }
+       DEBUG(5,("make_samr_r_query_usergroups\n"));
 
        if (status == 0x0)
        {
-               for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
-               {
-                       int acct_name_len = strlen(grp[i].name);
-                       int acct_desc_len = strlen(grp[i].comment);
-
-                       make_sam_entry3(&(r_u->sam[entries_added]),
-                                       start_idx + entries_added + 1,
-                                       acct_name_len,
-                                       acct_desc_len,
-                                       grp[i].rid);
-
-                       make_unistr2(&(r_u->str[entries_added].uni_grp_name), grp[i].name   , acct_name_len);
-                       make_unistr2(&(r_u->str[entries_added].uni_grp_desc), grp[i].comment, acct_desc_len);
-
-                       entries_added++;
-               }
+               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;
 
-               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;
+               r_u->gid = gid;
        }
        else
        {
-               r_u->switch_level = 0;
+               r_u->ptr_0       = 0;
+               r_u->num_entries = 0;
+               r_u->ptr_1       = 0;
        }
 
        r_u->status = status;
@@ -2091,103 +2414,123 @@ void make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
 /*******************************************************************
 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_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_enum_dom_groups");
+       prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
        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 ));
+       prs_uint32("ptr_0       ", ps, depth, &(r_u->ptr_0      ));
 
-       if (r_u->switch_level != 0)
+       if (r_u->ptr_0 != 0)
        {
-               prs_uint32("num_entries  ", ps, depth, &(r_u->num_entries  ));
-               prs_uint32("ptr_entries  ", ps, depth, &(r_u->ptr_entries  ));
-
-               prs_uint32("num_entries2 ", ps, depth, &(r_u->num_entries2 ));
-
-               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+               prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
+               prs_uint32("ptr_1       ", ps, depth, &(r_u->ptr_1      ));
 
-               for (i = 0; i < r_u->num_entries; i++)
+               if (r_u->num_entries != 0)
                {
-                       prs_grow(ps);
-                       sam_io_sam_entry3("", &(r_u->sam[i]), ps, depth);
-               }
+                       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
 
-               for (i = 0; i < r_u->num_entries; i++)
-               {
-                       prs_grow(ps);
-                       sam_io_sam_str3 ("", &(r_u->str[i]),
-                                            r_u->sam[i].hdr_grp_name.buffer,
-                                            r_u->sam[i].hdr_grp_desc.buffer,
-                                            ps, depth);
+                       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_USERGROUPS structure.
+makes a SAMR_Q_ENUM_DOM_GROUPS structure.
 ********************************************************************/
-void make_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
-                               POLICY_HND *hnd)
+void make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e, POLICY_HND *pol, uint32 size)
 {
-       if (q_u == NULL || hnd == NULL) return;
+       if (q_e == NULL || pol == NULL) return;
 
-       DEBUG(5,("make_samr_q_query_usergroups\n"));
+       DEBUG(5,("make_samr_q_enum_dom_groups\n"));
 
-       memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
+       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_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_struct *ps, int depth)
+void samr_io_q_enum_dom_groups(char *desc, SAMR_Q_ENUM_DOM_GROUPS *q_e, prs_struct *ps, int depth)
 {
-       if (q_u == NULL) return;
+       if (q_e == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
+       prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
        depth++;
 
        prs_align(ps);
 
-       smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+       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_QUERY_USERGROUPS structure.
+makes a SAMR_R_ENUM_DOM_GROUPS structure.
 ********************************************************************/
-void make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
-               uint32 num_gids, DOM_GID *gid, uint32 status)
+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_query_usergroups\n"));
+       DEBUG(5,("make_samr_r_enum_dom_groups\n"));
 
-       if (status == 0x0)
+       if (num_sam_entries >= MAX_SAM_ENTRIES)
        {
-               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;
+               num_sam_entries = MAX_SAM_ENTRIES;
+               DEBUG(5,("limiting number of entries to %d\n", 
+                        num_sam_entries));
+       }
 
-               r_u->gid = gid;
+       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_0       = 0;
-               r_u->num_entries = 0;
-               r_u->ptr_1       = 0;
+               r_u->ptr_entries = 0;
        }
 
        r_u->status = status;
@@ -2196,34 +2539,42 @@ void make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_query_usergroups(char *desc,  SAMR_R_QUERY_USERGROUPS *r_u, prs_struct *ps, int depth)
+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_query_usergroups");
+       prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
        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_entries", ps, depth, &(r_u->ptr_entries));
+       
+       if (r_u->num_entries != 0 && r_u->ptr_entries != 0)
        {
-               prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
-               prs_uint32("ptr_1       ", ps, depth, &(r_u->ptr_1      ));
+               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));
 
-               if (r_u->num_entries != 0)
+               SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+
+               for (i = 0; i < r_u->num_entries; i++)
                {
-                       prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
+                       sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
+               }
 
-                       for (i = 0; i < r_u->num_entries2; i++)
-                       {
-                               prs_grow(ps);
-                               smb_io_gid("", &(r_u->gid[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));
 }
 
@@ -2354,10 +2705,9 @@ void samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_s
                }
 
                prs_align(ps);
-
-               prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
        }
 
+       prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
@@ -2372,7 +2722,7 @@ void make_samr_alias_info3(ALIAS_INFO3 *al3, const char *acct_desc)
 
        DEBUG(5,("make_samr_alias_info3\n"));
 
-       make_uni_hdr(&(al3->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_uni_hdr(&(al3->hdr_acct_desc), acct_len);
        make_unistr2(&(al3->uni_acct_desc), acct_desc, acct_len);
 }
 
@@ -2813,7 +3163,7 @@ void make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
                for (i = 0; i < num_names; i++)
                {
                        int len = name[i] != NULL ? strlen(name[i]) : 0;
-                       make_uni_hdr(&(r_u->hdr_name[i]), len    , len, name[i] ? 1 : 0);
+                       make_uni_hdr(&(r_u->hdr_name[i]), len);
                        make_unistr2(&(r_u->uni_name[i]), name[i], len);
                        r_u->type[i] = type[i];
                }
@@ -2945,7 +3295,7 @@ void make_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS *q_u, POLICY_HND *hnd,
 
        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_uni_hdr(&(q_u->hdr_acct_desc), acct_len);
        make_unistr2(&(q_u->uni_acct_desc), acct_desc, acct_len);
 
        q_u->unknown_1 = 0x001f;
@@ -3280,7 +3630,7 @@ void make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
        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_uni_hdr(&(q_u->hdr_name[i]), len_name);  /* unicode header for user_name */
                make_unistr2(&(q_u->uni_name[i]), name[i], len_name);  /* unicode string for machine account */
        }
 }
@@ -3386,9 +3736,16 @@ void samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
        prs_uint32("num_rids1", ps, depth, &(r_u->num_rids1));
        prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids ));
 
-       if (r_u->ptr_rids != 0 && r_u->num_rids1 != 0)
+       if (r_u->ptr_rids != 0)
        {
                prs_uint32("num_rids2", ps, depth, &(r_u->num_rids2));
+
+               if (r_u->num_rids2 != r_u->num_rids1)
+               {
+                       /* RPC fault */
+                       return;
+               }
+
                for (i = 0; i < r_u->num_rids2; i++)
                {
                        prs_grow(ps);
@@ -3400,9 +3757,16 @@ void samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
        prs_uint32("num_types1", ps, depth, &(r_u->num_types1));
        prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types ));
 
-       if (r_u->ptr_types != 0 && r_u->num_types1 != 0)
+       if (r_u->ptr_types != 0)
        {
                prs_uint32("num_types2", ps, depth, &(r_u->num_types2));
+
+               if (r_u->num_types2 != r_u->num_types1)
+               {
+                       /* RPC fault */
+                       return;
+               }
+
                for (i = 0; i < r_u->num_types2; i++)
                {
                        prs_grow(ps);
@@ -3471,6 +3835,94 @@ 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));
 }
 
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void make_samr_q_create_user(SAMR_Q_CREATE_USER *q_u,
+                               POLICY_HND *pol,
+                               const char *name,
+                               uint16 acb_info, uint32 unk_1)
+{
+       int len_name;
+       if (q_u == NULL) return;
+       len_name = strlen(name);
+
+       DEBUG(5,("samr_make_samr_q_create_user\n"));
+
+       memcpy(&q_u->domain_pol, pol, sizeof(q_u->domain_pol));
+       
+       make_uni_hdr(&(q_u->hdr_name), len_name);  
+       make_unistr2(&(q_u->uni_name), name, len_name);
+
+       q_u->acb_info = acb_info;
+       q_u->unknown_1 = unk_1;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_create_user(char *desc,  SAMR_Q_CREATE_USER *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_create_user");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+       prs_align(ps);
+
+       smb_io_unihdr ("unihdr", &(q_u->hdr_name), ps, depth); 
+       smb_io_unistr2("unistr2", &(q_u->uni_name), q_u->hdr_name.buffer, ps, depth); 
+       prs_align(ps);
+
+       prs_uint16("acb_info", ps, depth, &(q_u->acb_info));
+       prs_align(ps);
+       prs_uint32("unknown_1", ps, depth, &(q_u->unknown_1));
+
+       prs_align(ps);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void make_samr_r_create_user(SAMR_R_CREATE_USER *r_u,
+                               POLICY_HND *user_pol,
+                               uint32 unk_0, uint32 user_rid,
+                               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("samr_make_samr_r_create_user\n"));
+
+       memcpy(&r_u->user_pol, user_pol, sizeof(r_u->user_pol));
+       
+       r_u->unknown_0 = unk_0;
+       r_u->user_rid = user_rid;
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_create_user(char *desc,  SAMR_R_CREATE_USER *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_create_user");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("user_pol", &(r_u->user_pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("unknown_0", ps, depth, &(r_u->unknown_0));
+       prs_uint32("user_rid ", ps, depth, &(r_u->user_rid ));
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
 /*******************************************************************
 makes a SAMR_Q_QUERY_USERINFO structure.
 ********************************************************************/
@@ -3578,7 +4030,7 @@ void make_sam_user_info11(SAM_USER_INFO_11 *usr,
        memcpy(&(usr->expiry),expiry, sizeof(usr->expiry)); /* expiry time or something? */
        bzero(usr->padding_1, sizeof(usr->padding_1)); /* 0 - padding 24 bytes */
 
-       make_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct, len_mach_acct, 4);  /* unicode header for machine account */
+       make_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct);  /* unicode header for machine account */
        usr->padding_2 = 0;               /* 0 - padding 4 bytes */
 
        usr->ptr_1        = 1;            /* pointer */
@@ -3653,6 +4105,217 @@ 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_infoa
+
+ unknown_3 = 0x09f8 27fa
+ unknown_5 = 0x0001 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+void make_sam_user_info_24(SAM_USER_INFO_24 *usr,
+       char newpass[516])
+{
+       memcpy(usr->pass, newpass, sizeof(usr->pass));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static void sam_io_user_info_24(char *desc,  SAM_USER_INFO_24 *usr, prs_struct *ps, int depth)
+{
+       if (usr == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_user_info");
+       depth++;
+
+       prs_align(ps);
+       
+       prs_uint8s (False, "password", ps, depth, usr->pass, sizeof(usr->pass));
+       prs_align(ps);
+}
+
+
+/*************************************************************************
+ make_sam_user_info23
+
+ unknown_3 = 0x09f8 27fa
+ unknown_5 = 0x0001 0000
+ unknown_6 = 0x0000 04ec 
+
+ *************************************************************************/
+void make_sam_user_info23(SAM_USER_INFO_23 *usr,
+
+       NTTIME *logon_time, /* all zeros */
+       NTTIME *logoff_time, /* all zeros */
+       NTTIME *kickoff_time, /* all zeros */
+       NTTIME *pass_last_set_time, /* all zeros */
+       NTTIME *pass_can_change_time, /* all zeros */
+       NTTIME *pass_must_change_time, /* all zeros */
+
+       char *user_name, /* NULL */
+       char *full_name,
+       char *home_dir,
+       char *dir_drive,
+       char *logon_script,
+       char *profile_path,
+       char *description,
+       char *workstations,
+       char *unknown_str,
+       char *munged_dial,
+
+       uint32 user_rid, /* 0x0000 0000 */
+       uint32 group_rid,
+       uint16 acb_info, 
+
+       uint32 unknown_3,
+       uint16 logon_divs,
+       LOGON_HRS *hrs,
+       uint32 unknown_5,
+       char newpass[516],
+       uint32 unknown_6)
+{
+       int len_user_name    = user_name    != NULL ? strlen(user_name   ) : 0;
+       int len_full_name    = full_name    != NULL ? strlen(full_name   ) : 0;
+       int len_home_dir     = home_dir     != NULL ? strlen(home_dir    ) : 0;
+       int len_dir_drive    = dir_drive    != NULL ? strlen(dir_drive   ) : 0;
+       int len_logon_script = logon_script != NULL ? strlen(logon_script) : 0;
+       int len_profile_path = profile_path != NULL ? strlen(profile_path) : 0;
+       int len_description  = description  != NULL ? strlen(description ) : 0;
+       int len_workstations = workstations != NULL ? strlen(workstations) : 0;
+       int len_unknown_str  = unknown_str  != NULL ? strlen(unknown_str ) : 0;
+       int len_munged_dial  = munged_dial  != NULL ? strlen(munged_dial ) : 0;
+
+       usr->logon_time            = *logon_time; /* all zeros */
+       usr->logoff_time           = *logoff_time; /* all zeros */
+       usr->kickoff_time          = *kickoff_time; /* all zeros */
+       usr->pass_last_set_time    = *pass_last_set_time; /* all zeros */
+       usr->pass_can_change_time  = *pass_can_change_time; /* all zeros */
+       usr->pass_must_change_time = *pass_must_change_time; /* all zeros */
+
+       make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   ); /* NULL */
+       make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   );
+       make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    );
+       make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   );
+       make_uni_hdr(&(usr->hdr_logon_script), len_logon_script);
+       make_uni_hdr(&(usr->hdr_profile_path), len_profile_path);
+       make_uni_hdr(&(usr->hdr_acct_desc   ), len_description );
+       make_uni_hdr(&(usr->hdr_workstations), len_workstations);
+       make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str );
+       make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial );
+
+       bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
+       bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
+
+       usr->user_rid  = user_rid; /* 0x0000 0000 */
+       usr->group_rid = group_rid;
+       usr->acb_info = acb_info;
+       usr->unknown_3 = unknown_3; /* 09f8 27fa */
+
+       usr->logon_divs = logon_divs; /* should be 168 (hours/week) */
+       usr->ptr_logon_hrs = hrs ? 1 : 0;
+
+       bzero(usr->padding1, sizeof(usr->padding1));
+
+       usr->unknown_5 = unknown_5; /* 0x0001 0000 */
+
+       memcpy(usr->pass, newpass, sizeof(usr->pass));
+
+       make_unistr2(&(usr->uni_user_name   ), user_name   , len_user_name   ); /* NULL */
+       make_unistr2(&(usr->uni_full_name   ), full_name   , len_full_name   );
+       make_unistr2(&(usr->uni_home_dir    ), home_dir    , len_home_dir    );
+       make_unistr2(&(usr->uni_dir_drive   ), dir_drive   , len_dir_drive   );
+       make_unistr2(&(usr->uni_logon_script), logon_script, len_logon_script);
+       make_unistr2(&(usr->uni_profile_path), profile_path, len_profile_path);
+       make_unistr2(&(usr->uni_acct_desc ), description , len_description );
+       make_unistr2(&(usr->uni_workstations), workstations, len_workstations);
+       make_unistr2(&(usr->uni_unknown_str ), unknown_str , len_unknown_str );
+       make_unistr2(&(usr->uni_munged_dial ), munged_dial , len_munged_dial );
+
+       usr->unknown_6 = unknown_6; /* 0x0000 04ec */
+       usr->padding4 = 0;
+
+       if (hrs)
+       {
+               memcpy(&(usr->logon_hrs), hrs, sizeof(usr->logon_hrs));
+       }
+       else
+       {
+               memset(&(usr->logon_hrs), 0xff, sizeof(usr->logon_hrs));
+       }
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static void sam_io_user_info23(char *desc,  SAM_USER_INFO_23 *usr, prs_struct *ps, int depth)
+{
+       if (usr == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_user_info");
+       depth++;
+
+       prs_align(ps);
+       
+       smb_io_time("logon_time           ", &(usr->logon_time)           , ps, depth);
+       smb_io_time("logoff_time          ", &(usr->logoff_time)          , ps, depth); 
+       smb_io_time("kickoff_time         ", &(usr->kickoff_time)         , ps, depth); 
+       smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time)   , ps, depth); 
+       smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time) , ps, depth); 
+       smb_io_time("pass_must_change_time", &(usr->pass_must_change_time), ps, depth); 
+
+       smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name)   , ps, depth); /* username unicode string header */
+       smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name)   , ps, depth); /* user's full name unicode string header */
+       smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir)    , ps, depth); /* home directory unicode string header */
+       smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive)   , ps, depth); /* home directory drive */
+       smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth); /* logon script unicode string header */
+       smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth); /* profile path unicode string header */
+       smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc  ) , ps, depth); /* account description */
+       smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth); /* workstations user can log on from */
+       smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str ), ps, depth); /* unknown string */
+       smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial ), ps, depth); /* workstations user can log on from */
+
+       prs_uint8s (False, "lm_pwd        ", ps, depth, usr->lm_pwd   , sizeof(usr->lm_pwd   ));
+       prs_uint8s (False, "nt_pwd        ", ps, depth, usr->nt_pwd   , sizeof(usr->nt_pwd   ));
+
+       prs_uint32("user_rid      ", ps, depth, &(usr->user_rid     ));       /* User ID */
+       prs_uint32("group_rid     ", ps, depth, &(usr->group_rid    ));      /* Group ID */
+       prs_uint16("acb_info      ", ps, depth, &(usr->acb_info     ));      /* Group ID */
+       prs_align(ps);
+
+       prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3    ));
+       prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs   ));     /* logon divisions per week */
+       prs_align(ps);
+       prs_uint32("ptr_logon_hrs ", ps, depth, &(usr->ptr_logon_hrs));
+       prs_uint8s (False, "padding1      ", ps, depth, usr->padding1, sizeof(usr->padding1));
+       prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5    ));
+
+       prs_uint8s (False, "password      ", ps, depth, usr->pass, sizeof(usr->pass));
+
+       /* here begins pointed-to data */
+
+       smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name)   , usr->hdr_user_name   .buffer, ps, depth); /* username unicode string */
+       smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name)   , usr->hdr_full_name   .buffer, ps, depth); /* user's full name unicode string */
+       smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir)    , usr->hdr_home_dir    .buffer, ps, depth); /* home directory unicode string */
+       smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive)   , usr->hdr_dir_drive   .buffer, ps, depth); /* home directory drive unicode string */
+       smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script), usr->hdr_logon_script.buffer, ps, depth); /* logon script unicode string */
+       smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path), usr->hdr_profile_path.buffer, ps, depth); /* profile path unicode string */
+       smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc   ), usr->hdr_acct_desc   .buffer, ps, depth); /* user description unicode string */
+       smb_io_unistr2("uni_workstations", &(usr->uni_workstations), usr->hdr_workstations.buffer, ps, depth); /* worksations user can log on from */
+       smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str ), usr->hdr_unknown_str .buffer, ps, depth); /* unknown string */
+       smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial ), usr->hdr_munged_dial .buffer, ps, depth); /* worksations user can log on from */
+
+       prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6  ));
+       prs_uint32("padding4      ", ps, depth, &(usr->padding4   ));
+
+       if (usr->ptr_logon_hrs)
+       {
+               sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs)   , ps, depth);
+               prs_align(ps);
+       }
+}
+
+
 /*************************************************************************
  make_sam_user_info21
 
@@ -3709,16 +4372,16 @@ void make_sam_user_info21(SAM_USER_INFO_21 *usr,
        usr->pass_can_change_time  = *pass_can_change_time;
        usr->pass_must_change_time = *pass_must_change_time;
 
-       make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   , len_user_name   , 1);
-       make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   , len_full_name   , 1);
-       make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    , len_home_dir    , 1);
-       make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   , len_dir_drive   , 1);
-       make_uni_hdr(&(usr->hdr_logon_script), len_logon_script, len_logon_script, 1);
-       make_uni_hdr(&(usr->hdr_profile_path), len_profile_path, len_profile_path, 1);
-       make_uni_hdr(&(usr->hdr_acct_desc   ), len_description , len_description , 1);
-       make_uni_hdr(&(usr->hdr_workstations), len_workstations, len_workstations, 1);
-       make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str , len_unknown_str , 1);
-       make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial , len_munged_dial , 1);
+       make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   );
+       make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   );
+       make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    );
+       make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   );
+       make_uni_hdr(&(usr->hdr_logon_script), len_logon_script);
+       make_uni_hdr(&(usr->hdr_profile_path), len_profile_path);
+       make_uni_hdr(&(usr->hdr_acct_desc   ), len_description );
+       make_uni_hdr(&(usr->hdr_workstations), len_workstations);
+       make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str );
+       make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial );
 
        bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
        bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
@@ -3957,14 +4620,54 @@ void samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struc
        prs_uint32("status", ps, depth, &(r_u->status));
 }
 
+/*******************************************************************
+makes a SAMR_Q_SET_USERINFO structure.
+********************************************************************/
+void make_samr_q_set_userinfo(SAMR_Q_SET_USERINFO *q_u,
+                               POLICY_HND *hnd,
+                               uint16 switch_value, void *info)
+{
+       if (q_u == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_set_userinfo\n"));
+
+       memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
+       q_u->switch_value  = switch_value;
+       q_u->switch_value2 = switch_value;
+
+       switch (switch_value)
+       {
+               case 0x18:
+               {
+                       q_u->info.id24 = (SAM_USER_INFO_24*)info;
+
+                       break;
+               }
+
+               case 0x17:
+               {
+                       q_u->info.id23 = (SAM_USER_INFO_23*)info;
+
+                       break;
+               }
+
+               default:
+               {
+                       DEBUG(4,("make_samr_q_set_userinfo: unsupported switch level\n"));
+                       break;
+               }
+       }
+}
+
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_unknown_32(char *desc,  SAMR_Q_UNKNOWN_32 *q_u, prs_struct *ps, int depth)
+void samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO *q_u, prs_struct *ps, int depth)
 {
        if (q_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_q_unknown_32");
+       prs_debug(ps, depth, desc, "samr_io_q_set_userinfo");
        depth++;
 
        prs_align(ps);
@@ -3972,35 +4675,77 @@ void samr_io_q_unknown_32(char *desc,  SAMR_Q_UNKNOWN_32 *q_u, prs_struct *ps, i
        smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
        prs_align(ps);
 
-       smb_io_unihdr ("", &(q_u->hdr_mach_acct), ps, depth); 
-       smb_io_unistr2("", &(q_u->uni_mach_acct), q_u->hdr_mach_acct.buffer, ps, depth); 
+       prs_uint16("switch_value ", ps, depth, &(q_u->switch_value )); 
+       prs_uint16("switch_value2", ps, depth, &(q_u->switch_value2)); 
 
        prs_align(ps);
 
-       prs_uint32("acct_ctrl", ps, depth, &(q_u->acct_ctrl));
-       prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
-       prs_uint16("unknown_2", ps, depth, &(q_u->unknown_2));
+       switch (q_u->switch_value)
+       {
+               case 0:
+               {
+                       break;
+               }
+               case 24:
+               {
+                       q_u->info.id = Realloc(NULL, sizeof(*q_u->info.id24));
+                       if (q_u->info.id == NULL)
+                       {
+                               DEBUG(2,("samr_io_q_query_userinfo: info pointer not initialised\n"));
+                               return;
+                       }
+                       sam_io_user_info_24("", q_u->info.id24, ps, depth);
+                       break;
+               }
+               case 23:
+               {
+                       q_u->info.id = Realloc(NULL, sizeof(*q_u->info.id23));
+                       if (q_u->info.id == NULL)
+                       {
+                               DEBUG(2,("samr_io_q_query_userinfo: info pointer not initialised\n"));
+                               return;
+                       }
+                       sam_io_user_info23("", q_u->info.id23, ps, depth);
+                       break;
+               }
+               default:
+               {
+                       DEBUG(2,("samr_io_q_query_userinfo: unknown switch level\n"));
+                       break;
+               }
+                       
+       }
+       prs_align(ps);
+}
+
+/*******************************************************************
+makes a SAMR_R_SET_USERINFO structure.
+********************************************************************/
+void make_samr_r_set_userinfo(SAMR_R_SET_USERINFO *r_u, uint32 status)
+                               
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_set_userinfo\n"));
+
+       r_u->status = status;         /* return status */
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_r_unknown_32(char *desc,  SAMR_R_UNKNOWN_32 *r_u, prs_struct *ps, int depth)
+void samr_io_r_set_userinfo(char *desc,  SAMR_R_SET_USERINFO *r_u, prs_struct *ps, int depth)
 {
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_unknown_32");
+       prs_debug(ps, depth, desc, "samr_io_r_set_userinfo");
        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_CONNECT structure.
 ********************************************************************/
@@ -4124,7 +4869,7 @@ void make_samr_q_unknown_38(SAMR_Q_UNKNOWN_38 *q_u, char *srv_name)
        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);
+       make_uni_hdr(&(q_u->hdr_srv_name), len_srv_name);
        make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name);  
 
 }
@@ -4256,9 +5001,9 @@ void make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
        DEBUG(5,("make_samr_q_chgpasswd_user\n"));
 
        q_u->ptr_0 = 1;
-       make_uni_hdr(&(q_u->hdr_dest_host), len_dest_host, len_dest_host, len_dest_host != 0);
+       make_uni_hdr(&(q_u->hdr_dest_host), len_dest_host);
        make_unistr2(&(q_u->uni_dest_host), dest_host, len_dest_host);  
-       make_uni_hdr(&(q_u->hdr_user_name), len_user_name, len_user_name, len_user_name != 0);
+       make_uni_hdr(&(q_u->hdr_user_name), len_user_name);
        make_unistr2(&(q_u->uni_user_name), user_name, len_user_name);  
 
        make_enc_passwd(&(q_u->nt_newpass), nt_newpass);