bugs in rpcclient. add_aliasmem uses a DOM_SID2 not a DOM_SID.
[samba.git] / source3 / rpc_parse / parse_samr.c
index 5a9b7660ab93c48335c7069e2f3b019c2f9765d5..52bcb4ff77d3e353f5d05fa40db87e16d118a4a1 100644 (file)
@@ -2,9 +2,9 @@
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
  *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
+ *  Copyright (C) Andrew Tridgell              1992-1998,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-1998,
+ *  Copyright (C) Paul Ashton                  1997-1998.
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@ void samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int
 reads or writes a structure.
 ********************************************************************/
 void make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
-                               POLICY_HND *connect_pol, uint32 rid,
+                               POLICY_HND *connect_pol, uint32 flags,
                                DOM_SID *sid)
 {
        if (q_u == NULL) return;
@@ -86,7 +86,7 @@ void make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
        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 +105,7 @@ void samr_io_q_open_domain(char *desc,  SAMR_Q_OPEN_DOMAIN *q_u, prs_struct *ps,
        smb_io_pol_hnd("connect_pol", &(q_u->connect_pol), ps, depth); 
        prs_align(ps);
 
-       prs_uint32("rid", ps, depth, &(q_u->rid));
+       prs_uint32("flags", ps, depth, &(q_u->flags));
 
        smb_io_dom_sid2("sid", &(q_u->dom_sid), ps, depth); 
        prs_align(ps);
@@ -853,7 +853,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 unk_0,
                uint32 num_sam_entries, SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES], uint32 status)
 {
        int i;
@@ -869,10 +869,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->unknown_0 = unk_0;
 
-       if (total_num_entries > 0)
+       if (num_sam_entries != 0)
        {
                r_u->ptr_entries1 = 1;
                r_u->ptr_entries2 = 1;
@@ -917,11 +916,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("unknown_0   ", ps, depth, &(r_u->unknown_0   ));
        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));
@@ -1284,93 +1282,6 @@ void samr_io_r_open_group(char *desc,  SAMR_R_OPEN_GROUP *r_u, prs_struct *ps, i
 }
 
 
-#if 0
-/* SAMR_Q_CREATE_DOM_GROUP - SAM create group */
-typedef struct q_samr_create_dom_group_info
-{
-       POLICY_HND pol;        /* policy handle */
-
-       UNIHDR hdr_acct_desc;
-       UNISTR2 uni_acct_desc;
-
-       uint16 unknown_1;    /* 0x0002 */
-       uint16 unknown_2;    /* 0x0001 */
-
-} SAMR_Q_CREATE_DOM_GROUP;
-
-/* SAMR_R_CREATE_DOM_GROUP - SAM create group */
-typedef struct r_samr_create_dom_group_info
-{
-       POLICY_HND pol;        /* policy handle */
-
-       uint32 rid;    
-       uint32 status;    
-
-} SAMR_R_CREATE_DOM_GROUP;
-
-
-/* SAMR_Q_SET_GROUPINFO - SAM Group Info */
-typedef struct q_samr_set_group_info
-{
-       POLICY_HND pol;        /* policy handle */
-       uint16 switch_value1;     /* 0x0004 seen */
-       uint16 switch_value2;     /* 0x0004 seen */
-
-       union
-       {
-               GROUP_INFO4 info4;
-
-       } group;
-
-} SAMR_Q_SET_GROUPINFO;
-
-/* SAMR_R_SET_GROUPINFO - SAM Group Info */
-typedef struct r_samr_set_group_info
-{
-       uint32 status;
-
-} SAMR_R_SET_GROUPINFO;
-
-
-/* SAMR_Q_ADD_GROUPMEM - probably an add group member */
-typedef struct q_samr_add_group_mem_info
-{
-       POLICY_HND pol;       /* policy handle */
-
-       uint32 rid;         /* rid */
-       uint32 unknown;     /* 0x0000 0005 */
-
-} SAMR_Q_ADD_GROUPMEM;
-
-
-/* SAMR_R_ADD_GROUPMEM - probably an add group member */
-typedef struct r_samr_add_group_mem_info
-{
-       uint32 status;         /* return status */
-
-} SAMR_R_ADD_GROUPMEM;
-
-
-/* SAMR_Q_OPEN_GROUP - probably an open */
-typedef struct q_samr_open_group_info
-{
-       POLICY_HND domain_pol;
-       uint32 unknown;         /* 0x0000 0001, 0x0000 0003, 0x0000 001f */
-       uint32 rid_group;        /* rid */
-
-} SAMR_Q_OPEN_GROUP;
-
-
-/* SAMR_R_OPEN_GROUP - probably an open */
-typedef struct r_samr_open_group_info
-{
-       POLICY_HND pol;       /* policy handle */
-       uint32 status;         /* return status */
-
-} SAMR_R_OPEN_GROUP;
-#endif
-
-
 /*******************************************************************
 makes a GROUP_INFO1 structure.
 ********************************************************************/
@@ -1384,11 +1295,12 @@ void make_samr_group_info1(GROUP_INFO1 *gr1,
        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_desc), desc_len , desc_len, acct_desc ? 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);
 }
@@ -1407,11 +1319,12 @@ void samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int dept
        prs_align(ps);
 
        smb_io_unihdr ("hdr_acct_name", &(gr1->hdr_acct_name) , ps, depth); 
-       smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
 
        prs_uint32("unknown_1", ps, depth, &(gr1->unknown_1));
        prs_uint32("unknown_2", ps, depth, &(gr1->unknown_2));
 
+       smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
+
        smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name), gr1->hdr_acct_name.buffer, ps, depth);
        prs_align(ps);
 
@@ -1421,7 +1334,7 @@ void samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int dept
 /*******************************************************************
 makes a GROUP_INFO4 structure.
 ********************************************************************/
-void make_samr_group_info4(GROUP_INFO4 *gr4, char *acct_desc)
+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;
@@ -1459,10 +1372,10 @@ void samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int d
        prs_debug(ps, depth, desc, "samr_group_info_ctr");
        depth++;
 
-       prs_uint16("switch_value", ps, depth, &(ctr->switch_value));
-       prs_align(ps);
+       prs_uint16("switch_value1", ps, depth, &(ctr->switch_value1));
+       prs_uint16("switch_value2", ps, depth, &(ctr->switch_value2));
 
-       switch (ctr->switch_value)
+       switch (ctr->switch_value1)
        {
                case 1:
                {
@@ -1485,6 +1398,342 @@ void samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int d
 }
 
 
+/*******************************************************************
+makes a SAMR_Q_CREATE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_e,
+                               POLICY_HND *pol,
+                               const char *acct_desc)
+{
+       int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_create_dom_group\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       make_uni_hdr(&(q_e->hdr_acct_desc), acct_len , acct_len, acct_desc ? 1 : 0);
+       make_unistr2(&(q_e->uni_acct_desc), acct_desc, acct_len);
+
+       q_e->unknown_1 = 0x0002;
+       q_e->unknown_2 = 0x0001;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_create_dom_group(char *desc,  SAMR_Q_CREATE_DOM_GROUP *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_create_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       smb_io_unihdr ("hdr_acct_desc", &(q_e->hdr_acct_desc), ps, depth); 
+       smb_io_unistr2("uni_acct_desc", &(q_e->uni_acct_desc), q_e->hdr_acct_desc.buffer, ps, depth);
+       prs_align(ps);
+
+       prs_uint16("unknown_1", ps, depth, &(q_e->unknown_1));
+       prs_uint16("unknown_2", ps, depth, &(q_e->unknown_2));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_CREATE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_r_create_dom_group(SAMR_R_CREATE_DOM_GROUP *r_u, POLICY_HND *pol,
+               uint32 rid, uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_create_dom_group\n"));
+
+       memcpy(&(r_u->pol), pol, sizeof(*pol));
+
+       r_u->rid    = rid   ;
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_create_dom_group(char *desc,  SAMR_R_CREATE_DOM_GROUP *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_create_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("rid   ", ps, depth, &(r_u->rid   ));
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+/*******************************************************************
+makes a SAMR_Q_DELETE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP *q_c, POLICY_HND *hnd)
+{
+       if (q_c == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_samr_q_delete_dom_group\n"));
+
+       memcpy(&(q_c->group_pol), hnd, sizeof(q_c->group_pol));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_delete_dom_group(char *desc,  SAMR_Q_DELETE_DOM_GROUP *q_u, prs_struct *ps, int depth)
+{
+       if (q_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
+}
+
+/*******************************************************************
+makes a SAMR_R_DELETE_DOM_GROUP structure.
+********************************************************************/
+void make_samr_r_delete_dom_group(SAMR_R_DELETE_DOM_GROUP *r_u,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_delete_dom_group\n"));
+
+       r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_delete_dom_group(char *desc,  SAMR_R_DELETE_DOM_GROUP *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_delete_dom_group");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+
+/*******************************************************************
+makes a SAMR_Q_DEL_GROUPMEM structure.
+********************************************************************/
+void make_samr_q_del_groupmem(SAMR_Q_DEL_GROUPMEM *q_e,
+                               POLICY_HND *pol,
+                               uint32 rid)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_del_groupmem\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->rid = rid;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_del_groupmem(char *desc,  SAMR_Q_DEL_GROUPMEM *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_del_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("rid    ", ps, depth, &(q_e->rid));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_DEL_GROUPMEM structure.
+********************************************************************/
+void make_samr_r_del_groupmem(SAMR_R_DEL_GROUPMEM *r_u, POLICY_HND *pol,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_del_groupmem\n"));
+
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_del_groupmem(char *desc,  SAMR_R_DEL_GROUPMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_del_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_ADD_GROUPMEM structure.
+********************************************************************/
+void make_samr_q_add_groupmem(SAMR_Q_ADD_GROUPMEM *q_e,
+                               POLICY_HND *pol,
+                               uint32 rid)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_add_groupmem\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+
+       q_e->rid = rid;
+       q_e->unknown = 0x0005;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_add_groupmem(char *desc,  SAMR_Q_ADD_GROUPMEM *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_add_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       prs_uint32("rid    ", ps, depth, &(q_e->rid));
+       prs_uint32("unknown", ps, depth, &(q_e->unknown));
+}
+
+
+/*******************************************************************
+makes a SAMR_R_ADD_GROUPMEM structure.
+********************************************************************/
+void make_samr_r_add_groupmem(SAMR_R_ADD_GROUPMEM *r_u, POLICY_HND *pol,
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_add_groupmem\n"));
+
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_add_groupmem(char *desc,  SAMR_R_ADD_GROUPMEM *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_add_groupmem");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_SET_GROUPINFO structure.
+********************************************************************/
+void make_samr_q_set_groupinfo(SAMR_Q_SET_GROUPINFO *q_e,
+                               POLICY_HND *pol, GROUP_INFO_CTR *ctr)
+{
+       if (q_e == NULL || pol == NULL) return;
+
+       DEBUG(5,("make_samr_q_set_groupinfo\n"));
+
+       memcpy(&(q_e->pol), pol, sizeof(*pol));
+       q_e->ctr = ctr;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_set_groupinfo(char *desc,  SAMR_Q_SET_GROUPINFO *q_e, prs_struct *ps, int depth)
+{
+       if (q_e == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_q_set_groupinfo");
+       depth++;
+
+       prs_align(ps);
+
+       smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+       prs_align(ps);
+
+       samr_group_info_ctr("ctr", q_e->ctr, ps, depth);
+}
+
+
+/*******************************************************************
+makes a SAMR_R_SET_GROUPINFO structure.
+********************************************************************/
+void make_samr_r_set_groupinfo(SAMR_R_SET_GROUPINFO *r_u, 
+               uint32 status)
+{
+       if (r_u == NULL) return;
+
+       DEBUG(5,("make_samr_r_set_groupinfo\n"));
+
+       r_u->status = status;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_set_groupinfo(char *desc,  SAMR_R_SET_GROUPINFO *r_u, prs_struct *ps, int depth)
+{
+       if (r_u == NULL) return;
+
+       prs_debug(ps, depth, desc, "samr_io_r_set_groupinfo");
+       depth++;
+
+       prs_align(ps);
+
+       prs_uint32("status", ps, depth, &(r_u->status));
+}
+
 /*******************************************************************
 makes a SAMR_Q_QUERY_GROUPINFO structure.
 ********************************************************************/
@@ -2054,7 +2303,7 @@ void samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_s
 /*******************************************************************
 makes a ALIAS_INFO3 structure.
 ********************************************************************/
-void make_samr_alias_info3(ALIAS_INFO3 *al3, char *acct_desc)
+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;
@@ -2092,23 +2341,20 @@ void samr_alias_info_ctr(char *desc,  ALIAS_INFO_CTR *ctr, prs_struct *ps, int d
        prs_debug(ps, depth, desc, "samr_alias_info_ctr");
        depth++;
 
-       prs_uint16("switch_value", ps, depth, &(ctr->switch_value));
-       prs_align(ps);
+       prs_uint16("switch_value1", ps, depth, &(ctr->switch_value1));
+       prs_uint16("switch_value2", ps, depth, &(ctr->switch_value2));
 
-       if (ctr->switch_value != 0)
+       switch (ctr->switch_value1)
        {
-               switch (ctr->switch_value)
+               case 3:
                {
-                       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;
-                       }
+                       samr_io_alias_info3("alias_info3", &(ctr->alias.info3), ps, depth);
+                       break;
+               }
+               default:
+               {
+                       DEBUG(4,("samr_alias_info_ctr: unsupported switch level\n"));
+                       break;
                }
        }
 
@@ -2252,7 +2498,7 @@ void make_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
        memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
 
        q_u->num_sids1 = 1;
-       q_u->ptr = 0;
+       q_u->ptr = 1;
        q_u->num_sids2 = 1;
 
        {
@@ -2418,11 +2664,11 @@ void samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, i
 }
 
 /*******************************************************************
-makes a SAMR_Q_UNKNOWN_12 structure.
+makes a SAMR_Q_LOOKUP_RIDS structure.
 ********************************************************************/
-void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
-               POLICY_HND *pol, uint32 rid,
-               uint32 num_gids, uint32 *gid)
+void make_samr_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u,
+               POLICY_HND *pol, uint32 flags,
+               uint32 num_rids, uint32 *rid)
 {
        int i;
        if (q_u == NULL) return;
@@ -2431,28 +2677,28 @@ void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
 
        memcpy(&(q_u->pol), pol, sizeof(*pol));
 
-       q_u->num_gids1 = num_gids;
-       q_u->rid       = rid;
+       q_u->num_rids1 = num_rids;
+       q_u->flags     = flags;
        q_u->ptr       = 0;
-       q_u->num_gids2 = num_gids;
+       q_u->num_rids2 = num_rids;
 
-       for (i = 0; i < num_gids; i++)
+       for (i = 0; i < num_rids; i++)
        {
-               q_u->gid[i] = gid[i];
+               q_u->rid[i] = rid[i];
        }
 }
 
 /*******************************************************************
 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_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_unknown_12");
+       prs_debug(ps, depth, desc, "samr_io_q_lookup_rids");
        depth++;
 
        prs_align(ps);
@@ -2460,18 +2706,18 @@ 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_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_gids2", ps, depth, &(q_u->num_gids2));
+       prs_uint32("num_rids2", ps, depth, &(q_u->num_rids2));
 
-       SMB_ASSERT_ARRAY(q_u->gid, q_u->num_gids2);
+       SMB_ASSERT_ARRAY(q_u->rid, q_u->num_rids2);
 
-       for (i = 0; i < q_u->num_gids2; i++)
+       for (i = 0; i < q_u->num_rids2; i++)
        {
                prs_grow(ps);
-               slprintf(tmp, sizeof(tmp) - 1, "gid[%02d]  ", i);
-               prs_uint32(tmp, ps, depth, &(q_u->gid[i]));
+               slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
+               prs_uint32(tmp, ps, depth, &(q_u->rid[i]));
        }
 
        prs_align(ps);
@@ -2479,16 +2725,16 @@ 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_RIDS structure.
 ********************************************************************/
-void make_samr_r_unknown_12(SAMR_R_UNKNOWN_12 *r_u,
+void make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
                uint32 num_names, fstring *name, uint8 *type,
                uint32 status)
 {
        int i;
        if (r_u == NULL || name == NULL || type == NULL) return;
 
-       DEBUG(5,("make_samr_r_unknown_12\n"));
+       DEBUG(5,("make_samr_r_lookup_rids\n"));
 
        if (status == 0x0)
        {
@@ -2527,13 +2773,13 @@ 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_rids(char *desc,  SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth)
 {
        int i;
        fstring tmp;
        if (r_u == NULL) return;
 
-       prs_debug(ps, depth, desc, "samr_io_r_unknown_12");
+       prs_debug(ps, depth, desc, "samr_io_r_lookup_rids");
        depth++;
 
        prs_align(ps);
@@ -2628,7 +2874,7 @@ void samr_io_r_delete_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struc
 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,
-                               char *acct_desc)
+                               const char *acct_desc)
 {
        int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
        if (q_u == NULL) return;
@@ -2666,6 +2912,22 @@ void samr_io_q_create_dom_alias(char *desc,  SAMR_Q_CREATE_DOM_ALIAS *q_u, prs_s
        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.
 ********************************************************************/
@@ -2682,49 +2944,49 @@ void samr_io_r_create_dom_alias(char *desc,  SAMR_R_CREATE_DOM_ALIAS *r_u, prs_s
        prs_uint32("rid", ps, depth, &(r_u->rid));
 
        prs_uint32("status", ps, depth, &(r_u->status));
-       }
+}
 
 
 
 /*******************************************************************
-makes a SAMR_Q_UNK_ALIASMEM structure.
+makes a SAMR_Q_ADD_ALIASMEM structure.
 ********************************************************************/
-void make_samr_q_unk_aliasmem(SAMR_Q_UNK_ALIASMEM *q_u, POLICY_HND *hnd,
+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_unk_aliasmem\n"));
+       DEBUG(5,("make_samr_q_add_aliasmem\n"));
 
        memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
-       sid_copy(&q_u->sid, sid);
+       make_dom_sid2(&q_u->sid, sid);
 }
 
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void samr_io_q_unk_aliasmem(char *desc,  SAMR_Q_UNK_ALIASMEM *q_u, prs_struct *ps, int depth)
+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_unk_aliasmem");
+       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_sid("sid      ", &(q_u->sid      ), ps, depth); 
+       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_unk_aliasmem(char *desc,  SAMR_R_UNK_ALIASMEM *r_u, prs_struct *ps, int depth)
+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_unk_aliasmem");
+       prs_debug(ps, depth, desc, "samr_io_r_add_aliasmem");
        depth++;
 
        prs_align(ps);
@@ -2734,44 +2996,44 @@ void samr_io_r_unk_aliasmem(char *desc,  SAMR_R_UNK_ALIASMEM *r_u, prs_struct *p
 
 
 /*******************************************************************
-makes a SAMR_Q_ADD_ALIASMEM structure.
+makes a SAMR_Q_DEL_ALIASMEM structure.
 ********************************************************************/
-void make_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM *q_u, POLICY_HND *hnd,
+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_add_aliasmem\n"));
+       DEBUG(5,("make_samr_q_del_aliasmem\n"));
 
        memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
-       sid_copy(&q_u->sid, sid);
+       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)
+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_add_aliasmem");
+       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_sid("sid      ", &(q_u->sid      ), 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)
+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_add_aliasmem");
+       prs_debug(ps, depth, desc, "samr_io_r_del_aliasmem");
        depth++;
 
        prs_align(ps);
@@ -2779,6 +3041,62 @@ void samr_io_r_add_aliasmem(char *desc,  SAMR_R_ADD_ALIASMEM *r_u, prs_struct *p
        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.
 ********************************************************************/
@@ -2878,6 +3196,33 @@ void samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struc
        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;
+
+       DEBUG(5,("make_samr_q_lookup_names\n"));
+
+       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.
@@ -2896,22 +3241,22 @@ void samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *p
        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("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_rids2", ps, depth, &(q_u->num_rids2));
+       prs_uint32("num_names2", ps, depth, &(q_u->num_names2));
 
-       SMB_ASSERT_ARRAY(q_u->hdr_user_name, q_u->num_rids2);
+       SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2);
 
-       for (i = 0; i < q_u->num_rids2; i++)
+       for (i = 0; i < q_u->num_names2; i++)
        {
                prs_grow(ps);
-               smb_io_unihdr ("", &(q_u->hdr_user_name[i]), ps, depth); 
+               smb_io_unihdr ("", &(q_u->hdr_name[i]), ps, depth); 
        }
-       for (i = 0; i < q_u->num_rids2; i++)
+       for (i = 0; i < q_u->num_names2; i++)
        {
                prs_grow(ps);
-               smb_io_unistr2("", &(q_u->uni_user_name[i]), q_u->hdr_user_name[i].buffer, ps, depth); 
+               smb_io_unistr2("", &(q_u->uni_name[i]), q_u->hdr_name[i].buffer, ps, depth); 
        }
 
        prs_align(ps);
@@ -2931,22 +3276,31 @@ void make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
 
        if (status == 0x0)
        {
-               r_u->num_entries  = num_rids;
-               r_u->undoc_buffer = 1;
-               r_u->num_entries2 = num_rids;
+               r_u->num_types1 = num_rids;
+               r_u->ptr_types  = 1;
+               r_u->num_types2 = num_rids;
+
+               r_u->num_rids1 = num_rids;
+               r_u->ptr_rids  = 1;
+               r_u->num_rids2 = num_rids;
 
-               SMB_ASSERT_ARRAY(r_u->dom_rid, num_rids);
+               SMB_ASSERT_ARRAY(r_u->rid, num_rids);
 
                for (i = 0; i < num_rids; i++)
                {
-                       make_dom_rid3(&(r_u->dom_rid[i]), rid[i], type[i]);
+                       r_u->rid [i] = rid [i];
+                       r_u->type[i] = type[i];
                }
        }
        else
        {
-               r_u->num_entries  = 0;
-               r_u->undoc_buffer = 0;
-               r_u->num_entries2 = 0;
+               r_u->num_types1 = 0;
+               r_u->ptr_types  = 0;
+               r_u->num_types2 = 0;
+
+               r_u->num_rids1 = 0;
+               r_u->ptr_rids  = 0;
+               r_u->num_rids2 = 0;
        }
 
        r_u->status = status;
@@ -2958,6 +3312,8 @@ reads or writes a structure.
 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_lookup_names");
@@ -2965,20 +3321,32 @@ void samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 
        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_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->num_entries != 0)
+       if (r_u->ptr_rids != 0 && r_u->num_rids1 != 0)
        {
-               SMB_ASSERT_ARRAY(r_u->dom_rid, r_u->num_entries2);
-
-               for (i = 0; i < r_u->num_entries2; i++)
+               for (i = 0; i < r_u->num_rids2; i++)
                {
                        prs_grow(ps);
-                       smb_io_dom_rid3("", &(r_u->dom_rid[i]), ps, depth);
+                       slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]  ", i);
+                       prs_uint32(tmp, ps, depth, &(r_u->rid[i]));
+               }
        }
 
+       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));
@@ -3174,8 +3542,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 */
 }
 
 /*******************************************************************
@@ -3224,6 +3590,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