groups and aliases being "manually" added which do not necessarily have
[samba.git] / source3 / rpc_server / srv_samr.c
index 88217f73aa95c4eed518b92707ae630a4b88125f..ec3fa289a7e638799bb14dea734777ca3cbf8292 100644 (file)
 
 extern int DEBUGLEVEL;
 
-extern BOOL sam_logon_in_ssb;
-extern pstring samlogon_user;
-extern DOM_SID global_machine_sid;
-
-extern rid_name domain_group_rids[];
-extern rid_name domain_alias_rids[];
+extern fstring global_sam_name;
+extern pstring global_myname;
+extern DOM_SID global_sam_sid;
+extern DOM_SID global_sid_S_1_1;
+extern DOM_SID global_sid_S_1_5_20;
 
 /*******************************************************************
   This next function should be replaced with something that
@@ -41,32 +40,47 @@ extern rid_name domain_alias_rids[];
  ********************************************************************/
 
 static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
+                               int start_idx,
                                 int *total_entries, int *num_entries,
                                 int max_num_entries,
                                 uint16 acb_mask)
 {
        void *vp = NULL;
-       struct smb_passwd *pwd = NULL;
+       struct sam_passwd *pwd = NULL;
 
        (*num_entries) = 0;
        (*total_entries) = 0;
 
        if (pw_buf == NULL) return False;
 
-       vp = startsampwent(False);
+       vp = startsmbpwent(False);
        if (!vp)
        {
-               DEBUG(0, ("get_sampwd_entries: Unable to open SMB password file.\n"));
+               DEBUG(0, ("get_sampwd_entries: Unable to open SMB password database.\n"));
                return False;
        }
 
-       while (((pwd = getsampwent(vp)) != NULL) && (*num_entries) < max_num_entries)
+       while (((pwd = getsam21pwent(vp)) != NULL) && (*num_entries) < max_num_entries)
        {
-               int user_name_len = strlen(pwd->smb_name);
-               make_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, user_name_len-1);
-               make_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len-1, 
-                              user_name_len-1, 1);
-               pw_buf[(*num_entries)].user_rid = pwd->smb_userid;
+               int user_name_len;
+
+               if (start_idx > 0)
+               {
+                       /* skip the requested number of entries.
+                          not very efficient, but hey...
+                        */
+                       if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask))
+                       {
+                               start_idx--;
+                       }
+                       continue;
+               }
+
+               user_name_len = strlen(pwd->nt_name);
+               make_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->nt_name, user_name_len);
+               make_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len, 
+                              user_name_len, 1);
+               pw_buf[(*num_entries)].user_rid = pwd->user_rid;
                bzero( pw_buf[(*num_entries)].nt_pwd , 16);
 
                /* Now check if the NT compatible password is available. */
@@ -77,8 +91,9 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
 
                pw_buf[(*num_entries)].acb_info = (uint16)pwd->acct_ctrl;
 
-               DEBUG(5, ("get_sampwd_entries: idx: %d user %s, uid %d, acb %x",
-               (*num_entries), pwd->smb_name, pwd->smb_userid, pwd->acct_ctrl));
+               DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x",
+                         (*num_entries), pwd->nt_name,
+                         pwd->user_rid, pwd->acct_ctrl));
 
                if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask))
                {
@@ -93,7 +108,7 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
                (*total_entries)++;
        }
 
-       endsampwent(vp);
+       endsmbpwent(vp);
 
        return (*num_entries) > 0;
 }
@@ -107,7 +122,7 @@ static void samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
        SAMR_R_CLOSE_HND r_u;
 
        /* set up the SAMR unknown_1 response */
-       bzero(&(r_u.pol.data), POL_HND_SIZE);
+       bzero(r_u.pol.data, POL_HND_SIZE);
 
        /* close the policy handle */
        if (close_lsa_policy_hnd(&(q_u->pol)))
@@ -131,14 +146,10 @@ static void samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
 /*******************************************************************
  api_samr_close_hnd
  ********************************************************************/
-static void api_samr_close_hnd( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_close_hnd( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
        SAMR_Q_CLOSE_HND q_u;
-
-       /* grab the samr unknown 1 */
        samr_io_q_close_hnd("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
        samr_reply_close_hnd(&q_u, rdata);
 }
 
@@ -151,12 +162,11 @@ static void samr_reply_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
 {
        SAMR_R_OPEN_DOMAIN r_u;
        BOOL pol_open = False;
-       int pol_idx;
 
        r_u.status = 0x0;
 
        /* find the connection policy handle. */
-       if (r_u.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->connect_pol))) == -1))
+       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->connect_pol)) == -1))
        {
                r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -191,18 +201,57 @@ static void samr_reply_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
 /*******************************************************************
  api_samr_open_domain
  ********************************************************************/
-static void api_samr_open_domain( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_open_domain( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
        SAMR_Q_OPEN_DOMAIN q_u;
-
-       /* grab the samr open */
        samr_io_q_open_domain("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
        samr_reply_open_domain(&q_u, rdata);
 }
 
 
+/*******************************************************************
+ samr_reply_unknown_2c
+ ********************************************************************/
+static void samr_reply_unknown_2c(SAMR_Q_UNKNOWN_2C *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_UNKNOWN_2C r_u;
+       uint32 status = 0x0;
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->user_pol)) == -1))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* find the user's rid */
+       if ((status == 0x0) && (get_lsa_policy_samr_rid(&(q_u->user_pol)) == 0xffffffff))
+       {
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       make_samr_r_unknown_2c(&r_u, status);
+
+       DEBUG(5,("samr_unknown_2c: %d\n", __LINE__));
+
+       /* store the response in the SMB stream */
+       samr_io_r_unknown_2c("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_unknown_2c: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_unknown_2c
+ ********************************************************************/
+static void api_samr_unknown_2c( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_UNKNOWN_2C q_u;
+       samr_io_q_unknown_2c("", &q_u, data, 0);
+       samr_reply_unknown_2c(&q_u, rdata);
+}
+
+
 /*******************************************************************
  samr_reply_unknown_3
  ********************************************************************/
@@ -211,16 +260,13 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
 {
        SAMR_R_UNKNOWN_3 r_u;
        DOM_SID3 sid[MAX_SAM_SIDS];
-       fstring user_sid;
-       fstring user_rid;
-       int pol_idx;
        uint32 rid;
        uint32 status;
 
        status = 0x0;
 
        /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->user_pol))) == -1))
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->user_pol)) == -1))
        {
                status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -228,19 +274,26 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
        /* find the user's rid */
        if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->user_pol))) == 0xffffffff)
        {
-               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
        }
 
        if (status == 0x0)
        {
-               sid_to_string(user_sid, &global_machine_sid);
-               slprintf(user_rid, sizeof(user_rid) - 1, "-%x", rid);
-               fstrcat(user_sid, user_rid);
+               DOM_SID usr_sid;
 
-               /* maybe need another 1 or 2 (S-1-5-20-0x220 and S-1-5-20-0x224) */
+               usr_sid = global_sam_sid;
+
+               SMB_ASSERT_ARRAY(usr_sid.sub_auths, usr_sid.num_auths+1);
+
+               /*
+                * Add the user RID.
+                */
+               sid_append_rid(&usr_sid, rid);
+               
+               /* maybe need another 1 or 2 (S-1-5-0x20-0x220 and S-1-5-20-0x224) */
                /* these two are DOMAIN_ADMIN and DOMAIN_ACCT_OP group RIDs */
-               make_dom_sid3(&(sid[0]), 0x035b, 0x0002, "S-1-1");
-               make_dom_sid3(&(sid[1]), 0x0044, 0x0002, user_sid);
+               make_dom_sid3(&(sid[0]), 0x035b, 0x0002, &global_sid_S_1_1);
+               make_dom_sid3(&(sid[1]), 0x0044, 0x0002, &usr_sid);
        }
 
        make_samr_r_unknown_3(&r_u,
@@ -260,14 +313,10 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
 /*******************************************************************
  api_samr_unknown_3
  ********************************************************************/
-static void api_samr_unknown_3( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_unknown_3( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
        SAMR_Q_UNKNOWN_3 q_u;
-
-       /* grab the samr open */
        samr_io_q_unknown_3("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
        samr_reply_unknown_3(&q_u, rdata);
 }
 
@@ -282,14 +331,11 @@ static void samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
        int num_entries;
        int total_entries;
-       int pol_idx;
-       BOOL got_pwds;
 
        r_e.status = 0x0;
-       r_e.total_num_entries = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -297,11 +343,12 @@ static void samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
        DEBUG(5,("samr_reply_enum_dom_users: %d\n", __LINE__));
 
        become_root(True);
-       got_pwds = get_sampwd_entries(pass, &total_entries, &num_entries, MAX_SAM_ENTRIES, q_u->acb_mask);
+       get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
+                          MAX_SAM_ENTRIES, q_u->acb_mask);
        unbecome_root(True);
 
-       make_samr_r_enum_dom_users(&r_e, total_entries,
-                                  q_u->unknown_0, num_entries,
+       make_samr_r_enum_dom_users(&r_e, 
+                                  q_u->start_idx + num_entries, num_entries,
                                   pass, r_e.status);
 
        /* store the response in the SMB stream */
@@ -314,777 +361,1895 @@ static void samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
 /*******************************************************************
  api_samr_enum_dom_users
  ********************************************************************/
-static void api_samr_enum_dom_users( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_enum_dom_users( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
        SAMR_Q_ENUM_DOM_USERS q_e;
-
-       /* grab the samr open */
        samr_io_q_enum_dom_users("", &q_e, data, 0);
-
-       /* construct reply. */
        samr_reply_enum_dom_users(&q_e, rdata);
 }
 
 
 /*******************************************************************
- samr_reply_enum_dom_groups
+ samr_reply_add_groupmem
  ********************************************************************/
-static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
+static void samr_reply_add_groupmem(SAMR_Q_ADD_GROUPMEM *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_ENUM_DOM_GROUPS r_e;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       int pol_idx;
-       BOOL got_grps;
-       char *dummy_group = "Domain Admins";
+       SAMR_R_ADD_GROUPMEM r_e;
+       DOM_SID group_sid;
+       uint32 group_rid;
+       fstring group_sid_str;
 
        r_e.status = 0x0;
-       r_e.num_entries = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &group_sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
+       else
+       {
+               sid_to_string(group_sid_str, &group_sid);
+               sid_split_rid(&group_sid, &group_rid);
+       }
 
-       DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
+       if (r_e.status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", group_sid_str));
 
-       got_grps = True;
-       num_entries = 1;
-       make_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group));
-       pass[0].user_rid = DOMAIN_GROUP_RID_ADMINS;
+               if (sid_equal(&group_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
 
-       if (r_e.status == 0 && got_grps)
-       {
-               make_samr_r_enum_dom_groups(&r_e, q_u->start_idx, num_entries, pass, r_e.status);
+                       become_root(True);
+                       r_e.status = add_group_member(group_rid, q_u->rid) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_SUCH_GROUP;
+               }
        }
 
        /* store the response in the SMB stream */
-       samr_io_r_enum_dom_groups("", &r_e, rdata, 0);
-
-       DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
+       samr_io_r_add_groupmem("", &r_e, rdata, 0);
 
+       DEBUG(5,("samr_add_groupmem: %d\n", __LINE__));
 }
 
 /*******************************************************************
- api_samr_enum_dom_groups
+ api_samr_add_groupmem
  ********************************************************************/
-static void api_samr_enum_dom_groups( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_add_groupmem( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_ENUM_DOM_GROUPS q_e;
-
-       /* grab the samr open */
-       samr_io_q_enum_dom_groups("", &q_e, data, 0);
-
-       /* construct reply. */
-       samr_reply_enum_dom_groups(&q_e, rdata);
+       SAMR_Q_ADD_GROUPMEM q_e;
+       samr_io_q_add_groupmem("", &q_e, data, 0);
+       samr_reply_add_groupmem(&q_e, rdata);
 }
 
-
 /*******************************************************************
- samr_reply_enum_dom_aliases
+ samr_reply_del_groupmem
  ********************************************************************/
-static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
+static void samr_reply_del_groupmem(SAMR_Q_DEL_GROUPMEM *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_ENUM_DOM_ALIASES r_e;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       int pol_idx;
-       BOOL got_aliases;
-       char *dummy_alias = "admins";
+       SAMR_R_DEL_GROUPMEM r_e;
+       DOM_SID group_sid;
+       uint32 group_rid;
+       fstring group_sid_str;
 
        r_e.status = 0x0;
-       r_e.num_entries = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &group_sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
+       else
+       {
+               sid_to_string(group_sid_str, &group_sid);
+               sid_split_rid(&group_sid, &group_rid);
+       }
 
-       DEBUG(5,("samr_reply_enum_dom_aliases: %d\n", __LINE__));
+       if (r_e.status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", group_sid_str));
 
-       got_aliases = True;
-       num_entries = 1;
-       make_unistr2(&(pass[0].uni_user_name), dummy_alias, strlen(dummy_alias));
-       pass[0].user_rid = DOMAIN_ALIAS_RID_ADMINS;
+               if (sid_equal(&group_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
 
-       if (r_e.status == 0 && got_aliases)
-       {
-               make_samr_r_enum_dom_aliases(&r_e, num_entries, pass, r_e.status);
+                       become_root(True);
+                       r_e.status = del_group_member(group_rid, q_u->rid) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_SUCH_GROUP;
+               }
        }
 
        /* store the response in the SMB stream */
-       samr_io_r_enum_dom_aliases("", &r_e, rdata, 0);
-
-       DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
+       samr_io_r_del_groupmem("", &r_e, rdata, 0);
 
+       DEBUG(5,("samr_del_groupmem: %d\n", __LINE__));
 }
 
 /*******************************************************************
- api_samr_enum_dom_aliases
+ api_samr_del_groupmem
  ********************************************************************/
-static void api_samr_enum_dom_aliases( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_del_groupmem( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_ENUM_DOM_ALIASES q_e;
-
-       /* grab the samr open */
-       samr_io_q_enum_dom_aliases("", &q_e, data, 0);
-
-       /* construct reply. */
-       samr_reply_enum_dom_aliases(&q_e, rdata);
+       SAMR_Q_DEL_GROUPMEM q_e;
+       samr_io_q_del_groupmem("", &q_e, data, 0);
+       samr_reply_del_groupmem(&q_e, rdata);
 }
 
-
 /*******************************************************************
- samr_reply_query_dispinfo
+ samr_reply_add_aliasmem
  ********************************************************************/
-static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u,
+static void samr_reply_add_aliasmem(SAMR_Q_ADD_ALIASMEM *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_QUERY_DISPINFO r_e;
-       SAM_INFO_CTR ctr;
-       SAM_INFO_1 info1;
-       SAM_INFO_2 info2;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       int total_entries;
-       int pol_idx;
-       BOOL got_pwds;
-       uint16 switch_level = 0x0;
+       SAMR_R_ADD_ALIASMEM r_e;
+       DOM_SID alias_sid;
+       uint32 alias_rid;
+       fstring alias_sid_str;
 
        r_e.status = 0x0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->alias_pol, &alias_sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
+       else
+       {
+               sid_to_string(alias_sid_str, &alias_sid);
+               sid_split_rid(&alias_sid, &alias_rid);
+       }
 
-       DEBUG(5,("samr_reply_query_dispinfo: %d\n", __LINE__));
-
-       become_root(True);
-       got_pwds = get_sampwd_entries(pass, &total_entries, &num_entries, MAX_SAM_ENTRIES, 0);
-       unbecome_root(True);
-
-       switch (q_u->switch_level)
+       if (r_e.status == 0x0)
        {
-               case 0x1:
-               {
-               
-                       /* query disp info is for users */
-                       switch_level = 0x1;
-                       make_sam_info_1(&info1, ACB_NORMAL,
-                               q_u->start_idx, num_entries, pass);
+               DEBUG(10,("sid is %s\n", alias_sid_str));
 
-                       ctr.sam.info1 = &info1;
+               if (sid_equal(&alias_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("add member on Domain SID\n"));
 
-                       break;
+                       become_root(True);
+                       r_e.status = add_alias_member(alias_rid, &q_u->sid.sid) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+                       unbecome_root(True);
                }
-               case 0x2:
+               else if (sid_equal(&alias_sid, &global_sid_S_1_5_20))
                {
-                       /* query disp info is for servers */
-                       switch_level = 0x2;
-                       make_sam_info_2(&info2, ACB_WSTRUST,
-                               q_u->start_idx, num_entries, pass);
+                       DEBUG(10,("add member on BUILTIN SID\n"));
 
-                       ctr.sam.info2 = &info2;
-
-                       break;
+                       become_root(True);
+                       r_e.status = add_builtin_member(alias_rid, &q_u->sid.sid) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
                }
-       }
-
-       if (r_e.status == 0 && got_pwds)
-       {
-               make_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
        }
 
        /* store the response in the SMB stream */
-       samr_io_r_query_dispinfo("", &r_e, rdata, 0);
-
-       DEBUG(5,("samr_query_dispinfo: %d\n", __LINE__));
+       samr_io_r_add_aliasmem("", &r_e, rdata, 0);
 
+       DEBUG(5,("samr_add_aliasmem: %d\n", __LINE__));
 }
 
 /*******************************************************************
- api_samr_query_dispinfo
+ api_samr_add_aliasmem
  ********************************************************************/
-static void api_samr_query_dispinfo( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_add_aliasmem( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_QUERY_DISPINFO q_e;
-
-       /* grab the samr open */
-       samr_io_q_query_dispinfo("", &q_e, data, 0);
-
-       /* construct reply. */
-       samr_reply_query_dispinfo(&q_e, rdata);
+       SAMR_Q_ADD_ALIASMEM q_e;
+       samr_io_q_add_aliasmem("", &q_e, data, 0);
+       samr_reply_add_aliasmem(&q_e, rdata);
 }
 
-
 /*******************************************************************
- samr_reply_query_aliasinfo
+ samr_reply_del_aliasmem
  ********************************************************************/
-static void samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
+static void samr_reply_del_aliasmem(SAMR_Q_DEL_ALIASMEM *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_QUERY_ALIASINFO r_e;
-       int pol_idx;
-       BOOL got_alias;
+       SAMR_R_DEL_ALIASMEM r_e;
+       DOM_SID alias_sid;
+       uint32 alias_rid;
+       fstring alias_sid_str;
 
        r_e.status = 0x0;
-       r_e.ptr = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->alias_pol, &alias_sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
-
-       DEBUG(5,("samr_reply_query_aliasinfo: %d\n", __LINE__));
+       else
+       {
+               sid_to_string(alias_sid_str, &alias_sid);
+               sid_split_rid(&alias_sid, &alias_rid);
+       }
 
        if (r_e.status == 0x0)
        {
-               if (q_u->switch_level != 3)
+               DEBUG(10,("sid is %s\n", alias_sid_str));
+
+               if (sid_equal(&alias_sid, &global_sam_sid))
                {
-                       r_e.status = NT_STATUS_INVALID_INFO_CLASS;
+                       DEBUG(10,("del member on Domain SID\n"));
+
+                       become_root(True);
+                       r_e.status = del_alias_member(alias_rid, &q_u->sid.sid) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+                       unbecome_root(True);
                }
-       }
+               else if (sid_equal(&alias_sid, &global_sid_S_1_5_20))
+               {
+                       DEBUG(10,("del member on BUILTIN SID\n"));
 
-       if (r_e.status == 0x0)
-       {
-               got_alias = True;
+                       become_root(True);
+                       r_e.status = del_builtin_member(alias_rid, &q_u->sid.sid) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+               }
        }
 
-       make_samr_r_query_aliasinfo(&r_e, q_u->switch_level,
-                           "<account description>",
-                               r_e.status);
-
        /* store the response in the SMB stream */
-       samr_io_r_query_aliasinfo("", &r_e, rdata, 0);
-
-       DEBUG(5,("samr_query_aliasinfo: %d\n", __LINE__));
+       samr_io_r_del_aliasmem("", &r_e, rdata, 0);
 
+       DEBUG(5,("samr_del_aliasmem: %d\n", __LINE__));
 }
 
 /*******************************************************************
- api_samr_query_aliasinfo
+ api_samr_del_aliasmem
  ********************************************************************/
-static void api_samr_query_aliasinfo( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_del_aliasmem( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_QUERY_ALIASINFO q_e;
-
-       /* grab the samr open */
-       samr_io_q_query_aliasinfo("", &q_e, data, 0);
-
-       /* construct reply. */
-       samr_reply_query_aliasinfo(&q_e, rdata);
+       SAMR_Q_DEL_ALIASMEM q_e;
+       samr_io_q_del_aliasmem("", &q_e, data, 0);
+       samr_reply_del_aliasmem(&q_e, rdata);
 }
 
-
 /*******************************************************************
- samr_reply_lookup_ids
+ samr_reply_add_groupmem
  ********************************************************************/
-static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
+static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
                                prs_struct *rdata)
 {
-       uint32 rid[MAX_SAM_ENTRIES];
-       uint32 status     = 0;
-       int num_rids = q_u->num_sids1;
-
-       SAMR_R_LOOKUP_IDS r_u;
+       SAMR_R_ENUM_DOM_GROUPS r_e;
+       DOMAIN_GRP *grps = NULL;
+       int num_entries = 0;
+       BOOL got_grps = False;
+       DOM_SID sid;
+       fstring sid_str;
 
-       DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
+       r_e.status = 0x0;
+       r_e.num_entries = 0;
 
-       if (num_rids > MAX_SAM_ENTRIES)
+       /* find the policy handle.  open a policy on it. */
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
        {
-               num_rids = MAX_SAM_ENTRIES;
-               DEBUG(5,("samr_lookup_ids: truncating entries to %d\n", num_rids));
+               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-#if 0
-       int i;
-       for (i = 0; i < num_rids && status == 0; i++)
-       {
-               struct smb_passwd *smb_pass;
-               fstring user_name;
+       sid_to_string(sid_str, &sid);
 
-               fstrcpy(user_name, unistrn2(q_u->uni_user_name[i].buffer,
-                                                                       q_u->uni_user_name[i].uni_str_len));
+       DEBUG(5,("samr_reply_enum_dom_groups: sid %s\n", sid_str));
+
+       if (sid_equal(&sid, &global_sam_sid))
+       {
+               BOOL ret;
+               got_grps = True;
 
-               /* find the user account */
                become_root(True);
-               smb_pass = get_sampwd_entry(user_name, 0);
+               ret = enumdomgroups(&grps, &num_entries);
                unbecome_root(True);
 
-               if (smb_pass == NULL)
-               {
-                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-                       rid[i] = 0;
-               }
-               else
+               if (!ret)
                {
-                       /* lkclXXXX SHOULD use name_to_rid() here! */
-                       rid[i] = smb_pass->smb_userid;
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
                }
        }
-#endif
-
-       num_rids = 1;
-       rid[0] = DOMAIN_ALIAS_RID_USERS;
 
-       make_samr_r_lookup_ids(&r_u, num_rids, rid, status);
+       if (r_e.status == 0 && got_grps)
+       {
+               make_samr_r_enum_dom_groups(&r_e, q_u->start_idx, num_entries, grps, r_e.status);
+       }
 
        /* store the response in the SMB stream */
-       samr_io_r_lookup_ids("", &r_u, rdata, 0);
+       samr_io_r_enum_dom_groups("", &r_e, rdata, 0);
 
-       DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
+       if (grps != NULL)
+       {
+               free(grps);
+       }
 
+       DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
 }
 
 /*******************************************************************
- api_samr_lookup_ids
+ api_samr_enum_dom_groups
  ********************************************************************/
-static void api_samr_lookup_ids( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_enum_dom_groups( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_LOOKUP_IDS q_u;
-
-       /* grab the samr 0x10 */
-       samr_io_q_lookup_ids("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
-       samr_reply_lookup_ids(&q_u, rdata);
+       SAMR_Q_ENUM_DOM_GROUPS q_e;
+       samr_io_q_enum_dom_groups("", &q_e, data, 0);
+       samr_reply_enum_dom_groups(&q_e, rdata);
 }
 
+
 /*******************************************************************
- samr_reply_lookup_names
+ samr_reply_enum_dom_aliases
  ********************************************************************/
-static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
+static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
                                prs_struct *rdata)
 {
-       uint32 rid[MAX_SAM_ENTRIES];
-       uint32 status     = 0;
-       int i;
-       int num_rids = q_u->num_rids1;
-
-       SAMR_R_LOOKUP_NAMES r_u;
+       SAMR_R_ENUM_DOM_ALIASES r_e;
+       LOCAL_GRP *alss = NULL;
+       int num_entries = 0;
+       DOM_SID sid;
+       fstring sid_str;
 
-       DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+       r_e.status = 0x0;
+       r_e.num_entries = 0;
 
-       if (num_rids > MAX_SAM_ENTRIES)
+       /* find the policy handle.  open a policy on it. */
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
        {
-               num_rids = MAX_SAM_ENTRIES;
-               DEBUG(5,("samr_lookup_names: truncating entries to %d\n", num_rids));
+               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-       for (i = 0; i < num_rids && status == 0; i++)
-       {
-               fstring name;
+       sid_to_string(sid_str, &sid);
 
-               status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+       DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
 
-               fstrcpy(name, unistrn2(q_u->uni_user_name[i].buffer, q_u->uni_user_name[i].uni_str_len));
+       /* well-known aliases */
+       if (sid_equal(&sid, &global_sid_S_1_5_20))
+       {
+               BOOL ret;
+               /* builtin aliases */
 
-               status = (status != 0x0) ? lookup_user_rid (name, &(rid[i])) : status;
-               status = (status != 0x0) ? lookup_group_rid(name, &(rid[i])) : status;
-               status = (status != 0x0) ? lookup_alias_rid(name, &(rid[i])) : status;
+               become_root(True);
+               ret = enumdombuiltins(&alss, &num_entries);
+               unbecome_root(True);
+               if (!ret)
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
+               }
        }
+       else if (sid_equal(&sid, &global_sam_sid))
+       {
+               BOOL ret;
+               /* local aliases */
 
-       make_samr_r_lookup_names(&r_u, num_rids, rid, status);
-
-       /* store the response in the SMB stream */
-       samr_io_r_lookup_names("", &r_u, rdata, 0);
-
-       DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
-
-}
+               become_root(True);
+               ret = enumdomaliases(&alss, &num_entries);
+               unbecome_root(True);
+               if (!ret)
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
+               }
+       }
+               
+       if (r_e.status == 0x0)
+       {
+               make_samr_r_enum_dom_aliases(&r_e, num_entries, alss, r_e.status);
+       }
+
+       /* store the response in the SMB stream */
+       samr_io_r_enum_dom_aliases("", &r_e, rdata, 0);
+
+       if (alss != NULL)
+       {
+               free(alss);
+       }
+
+       DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_enum_dom_aliases
+ ********************************************************************/
+static void api_samr_enum_dom_aliases( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_ENUM_DOM_ALIASES q_e;
+
+       /* grab the samr open */
+       samr_io_q_enum_dom_aliases("", &q_e, data, 0);
+
+       /* construct reply. */
+       samr_reply_enum_dom_aliases(&q_e, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_query_dispinfo
+ ********************************************************************/
+static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_QUERY_DISPINFO r_e;
+       SAM_INFO_CTR ctr;
+       SAM_INFO_1 info1;
+       SAM_INFO_2 info2;
+       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
+       int num_entries = 0;
+       int total_entries = 0;
+       BOOL got_pwds;
+       uint16 switch_level = 0x0;
+
+       ZERO_STRUCT(r_e);
+
+       r_e.status = 0x0;
+
+       DEBUG(5,("samr_reply_query_dispinfo: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       {
+               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+               DEBUG(5,("samr_reply_query_dispinfo: invalid handle\n"));
+       }
+
+       if (r_e.status == 0x0)
+       {
+               become_root(True);
+               got_pwds = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries, MAX_SAM_ENTRIES, 0);
+               unbecome_root(True);
+
+               switch (q_u->switch_level)
+               {
+                       case 0x1:
+                       {
+                       
+                               /* query disp info is for users */
+                               switch_level = 0x1;
+                               make_sam_info_1(&info1, ACB_NORMAL,
+                                       q_u->start_idx, num_entries, pass);
+
+                               ctr.sam.info1 = &info1;
+
+                               break;
+                       }
+                       case 0x2:
+                       {
+                               /* query disp info is for servers */
+                               switch_level = 0x2;
+                               make_sam_info_2(&info2, ACB_WSTRUST,
+                                       q_u->start_idx, num_entries, pass);
+
+                               ctr.sam.info2 = &info2;
+
+                               break;
+                       }
+               }
+       }
+
+       if (r_e.status == 0 && got_pwds)
+       {
+               make_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
+       }
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_dispinfo("", &r_e, rdata, 0);
+
+       DEBUG(5,("samr_query_dispinfo: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_dispinfo
+ ********************************************************************/
+static void api_samr_query_dispinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_DISPINFO q_e;
+
+       /* grab the samr open */
+       samr_io_q_query_dispinfo("", &q_e, data, 0);
+
+       /* construct reply. */
+       samr_reply_query_dispinfo(&q_e, rdata);
+}
+
+/*******************************************************************
+ samr_reply_delete_dom_group
+ ********************************************************************/
+static void samr_reply_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP *q_u,
+                               prs_struct *rdata)
+{
+       uint32 status = 0;
+
+       DOM_SID group_sid;
+       uint32 group_rid;
+       fstring group_sid_str;
+
+       SAMR_R_DELETE_DOM_GROUP r_u;
+
+       DEBUG(5,("samr_delete_dom_group: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->group_pol, &group_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+       else
+       {
+               sid_to_string(group_sid_str, &group_sid     );
+               sid_split_rid(&group_sid, &group_rid);
+       }
+
+       if (status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", group_sid_str));
+
+               if (sid_equal(&group_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
+
+                       become_root(True);
+                       status = del_group_entry(group_rid) ? 0x0 : (0xC0000000 | NT_STATUS_NO_SUCH_GROUP);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_GROUP;
+               }
+       }
+
+       make_samr_r_delete_dom_group(&r_u, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_delete_dom_group("", &r_u, rdata, 0);
+}
+
+/*******************************************************************
+ api_samr_delete_dom_group
+ ********************************************************************/
+static void api_samr_delete_dom_group( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_DELETE_DOM_GROUP q_u;
+       samr_io_q_delete_dom_group("", &q_u, data, 0);
+       samr_reply_delete_dom_group(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_query_groupmem
+ ********************************************************************/
+static void samr_reply_query_groupmem(SAMR_Q_QUERY_GROUPMEM *q_u,
+                               prs_struct *rdata)
+{
+       uint32 status = 0;
+
+       DOMAIN_GRP_MEMBER *mem_grp = NULL;
+       uint32 *rid = NULL;
+       uint32 *attr = NULL;
+       int num_rids = 0;
+       DOM_SID group_sid;
+       uint32 group_rid;
+       fstring group_sid_str;
+
+       SAMR_R_QUERY_GROUPMEM r_u;
+
+       DEBUG(5,("samr_query_groupmem: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->group_pol, &group_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+       else
+       {
+               sid_to_string(group_sid_str, &group_sid     );
+               sid_split_rid(&group_sid, &group_rid);
+       }
+
+       if (status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", group_sid_str));
+
+               if (sid_equal(&group_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
+
+                       become_root(True);
+                       status = getgrouprid(group_rid, &mem_grp, &num_rids) != NULL ? 0x0 : (0xC0000000 | NT_STATUS_NO_SUCH_GROUP);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_GROUP;
+               }
+       }
+
+       if (status == 0x0 && num_rids > 0)
+       {
+               rid  = malloc(num_rids * sizeof(uint32));
+               attr = malloc(num_rids * sizeof(uint32));
+               if (mem_grp != NULL && rid != NULL && attr != NULL)
+               {
+                       int i;
+                       for (i = 0; i < num_rids; i++)
+                       {
+                               rid [i] = mem_grp[i].rid;
+                               attr[i] = mem_grp[i].attr;
+                       }
+                       free(mem_grp);
+               }
+       }
+
+       make_samr_r_query_groupmem(&r_u, num_rids, rid, attr, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_groupmem("", &r_u, rdata, 0);
+
+       if (rid != NULL)
+       {
+               free(rid);
+       }
+
+       if (attr != NULL)
+       {
+               free(attr);
+       }
+
+       DEBUG(5,("samr_query_groupmem: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_groupmem
+ ********************************************************************/
+static void api_samr_query_groupmem( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_GROUPMEM q_u;
+       samr_io_q_query_groupmem("", &q_u, data, 0);
+       samr_reply_query_groupmem(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_query_groupinfo
+ ********************************************************************/
+static void samr_reply_query_groupinfo(SAMR_Q_QUERY_GROUPINFO *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_QUERY_GROUPINFO r_e;
+       GROUP_INFO_CTR ctr;
+       uint32 status = 0x0;
+
+       r_e.ptr = 0;
+
+       /* find the policy handle.  open a policy on it. */
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       {
+               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       DEBUG(5,("samr_reply_query_groupinfo: %d\n", __LINE__));
+
+       if (status == 0x0)
+       {
+               if (q_u->switch_level == 1)
+               {
+                       r_e.ptr = 1;
+                       ctr.switch_value1 = 1;
+                       make_samr_group_info1(&ctr.group.info1, "account name", "account description");
+               }
+               else if (q_u->switch_level == 4)
+               {
+                       r_e.ptr = 1;
+                       ctr.switch_value1 = 4;
+                       make_samr_group_info4(&ctr.group.info4, "account description");
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
+               }
+       }
+
+       make_samr_r_query_groupinfo(&r_e, status == 0 ? &ctr : NULL, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_groupinfo("", &r_e, rdata, 0);
+
+       DEBUG(5,("samr_query_groupinfo: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_groupinfo
+ ********************************************************************/
+static void api_samr_query_groupinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_GROUPINFO q_e;
+       samr_io_q_query_groupinfo("", &q_e, data, 0);
+       samr_reply_query_groupinfo(&q_e, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_query_aliasinfo
+ ********************************************************************/
+static void samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_QUERY_ALIASINFO r_e;
+       ALIAS_INFO_CTR ctr;
+       uint32 status = 0x0;
+
+       r_e.ptr = 0;
+
+       /* find the policy handle.  open a policy on it. */
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       {
+               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       DEBUG(5,("samr_reply_query_aliasinfo: %d\n", __LINE__));
+
+       if (status == 0x0)
+       {
+               if (q_u->switch_level == 3)
+               {
+                       r_e.ptr = 1;
+                       ctr.switch_value1 = 3;
+                       make_samr_alias_info3(&ctr.alias.info3, "<account description>");
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
+               }
+       }
+
+       make_samr_r_query_aliasinfo(&r_e, status == 0 ? &ctr : NULL, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_aliasinfo("", &r_e, rdata, 0);
+
+       DEBUG(5,("samr_query_aliasinfo: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_aliasinfo
+ ********************************************************************/
+static void api_samr_query_aliasinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_ALIASINFO q_e;
+       samr_io_q_query_aliasinfo("", &q_e, data, 0);
+       samr_reply_query_aliasinfo(&q_e, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_query_useraliases
+ ********************************************************************/
+static void samr_reply_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
+                               prs_struct *rdata)
+{
+       uint32 status = 0;
+
+       LOCAL_GRP *mem_grp = NULL;
+       uint32 *rid = NULL;
+       int num_rids = 0;
+       struct sam_passwd *sam_pass;
+       DOM_SID usr_sid;
+       DOM_SID dom_sid;
+       uint32 user_rid;
+       fstring sam_sid_str;
+       fstring dom_sid_str;
+       fstring usr_sid_str;
+
+       SAMR_R_QUERY_USERALIASES r_u;
+
+       DEBUG(5,("samr_query_useraliases: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &dom_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+       else
+       {
+               sid_to_string(dom_sid_str, &dom_sid       );
+               sid_to_string(sam_sid_str, &global_sam_sid);
+       }
+
+       if (status == 0x0)
+       {
+               usr_sid = q_u->sid[0].sid;
+               sid_split_rid(&usr_sid, &user_rid);
+               sid_to_string(usr_sid_str, &usr_sid);
+
+       }
+
+       if (status == 0x0)
+       {
+               /* find the user account */
+               become_root(True);
+               sam_pass = getsam21pwrid(user_rid);
+               unbecome_root(True);
+
+               if (sam_pass == NULL)
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+                       num_rids = 0;
+               }
+       }
+
+       if (status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", dom_sid_str));
+
+               if (sid_equal(&dom_sid, &global_sid_S_1_5_20))
+               {
+                       DEBUG(10,("lookup on S-1-5-20\n"));
+
+                       become_root(True);
+                       getuserbuiltinntnam(sam_pass->nt_name, &mem_grp, &num_rids);
+                       unbecome_root(True);
+               }
+               else if (sid_equal(&dom_sid, &usr_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
+
+                       become_root(True);
+                       getuseraliasntnam(sam_pass->nt_name, &mem_grp, &num_rids);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+               }
+       }
+
+       if (status == 0x0 && num_rids > 0)
+       {
+               rid = malloc(num_rids * sizeof(uint32));
+               if (mem_grp != NULL && rid != NULL)
+               {
+                       int i;
+                       for (i = 0; i < num_rids; i++)
+                       {
+                               rid[i] = mem_grp[i].rid;
+                       }
+                       free(mem_grp);
+               }
+       }
+
+       make_samr_r_query_useraliases(&r_u, num_rids, rid, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_useraliases("", &r_u, rdata, 0);
+
+       if (rid != NULL)
+       {
+               free(rid);
+       }
+
+       DEBUG(5,("samr_query_useraliases: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_useraliases
+ ********************************************************************/
+static void api_samr_query_useraliases( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_USERALIASES q_u;
+       samr_io_q_query_useraliases("", &q_u, data, 0);
+       samr_reply_query_useraliases(&q_u, rdata);
+}
+
+/*******************************************************************
+ samr_reply_delete_dom_alias
+ ********************************************************************/
+static void samr_reply_delete_dom_alias(SAMR_Q_DELETE_DOM_ALIAS *q_u,
+                               prs_struct *rdata)
+{
+       uint32 status = 0;
+
+       DOM_SID alias_sid;
+       uint32 alias_rid;
+       fstring alias_sid_str;
+
+       SAMR_R_DELETE_DOM_ALIAS r_u;
+
+       DEBUG(5,("samr_delete_dom_alias: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->alias_pol, &alias_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+       else
+       {
+               sid_to_string(alias_sid_str, &alias_sid     );
+               sid_split_rid(&alias_sid, &alias_rid);
+       }
+
+       if (status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", alias_sid_str));
+
+               if (sid_equal(&alias_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
+
+                       become_root(True);
+                       status = del_alias_entry(alias_rid) ? 0x0 : (0xC0000000 | NT_STATUS_NO_SUCH_ALIAS);
+                       unbecome_root(True);
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+               }
+       }
+
+       make_samr_r_delete_dom_alias(&r_u, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_delete_dom_alias("", &r_u, rdata, 0);
+}
+
+/*******************************************************************
+ api_samr_delete_dom_alias
+ ********************************************************************/
+static void api_samr_delete_dom_alias( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_DELETE_DOM_ALIAS q_u;
+       samr_io_q_delete_dom_alias("", &q_u, data, 0);
+       samr_reply_delete_dom_alias(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_query_aliasmem
+ ********************************************************************/
+static void samr_reply_query_aliasmem(SAMR_Q_QUERY_ALIASMEM *q_u,
+                               prs_struct *rdata)
+{
+       uint32 status = 0;
+
+       LOCAL_GRP_MEMBER *mem_grp = NULL;
+       DOM_SID2 *sid = NULL;
+       int num_sids = 0;
+       DOM_SID alias_sid;
+       uint32 alias_rid;
+       fstring alias_sid_str;
+
+       SAMR_R_QUERY_ALIASMEM r_u;
+
+       DEBUG(5,("samr_query_aliasmem: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->alias_pol, &alias_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+       else
+       {
+               sid_to_string(alias_sid_str, &alias_sid     );
+               sid_split_rid(&alias_sid, &alias_rid);
+       }
+
+       if (status == 0x0)
+       {
+               DEBUG(10,("sid is %s\n", alias_sid_str));
+
+               if (sid_equal(&alias_sid, &global_sid_S_1_5_20))
+               {
+                       DEBUG(10,("lookup on S-1-5-20\n"));
+
+                       become_root(True);
+                       status = getbuiltinrid(alias_rid, &mem_grp, &num_sids) != NULL ? 0x0 : 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+                       unbecome_root(True);
+               }
+               else if (sid_equal(&alias_sid, &global_sam_sid))
+               {
+                       DEBUG(10,("lookup on Domain SID\n"));
+
+                       become_root(True);
+                       status = getaliasrid(alias_rid, &mem_grp, &num_sids) != NULL ? 0x0 : 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+                       unbecome_root(True);
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+               }
+       }
+
+       if (status == 0x0 && num_sids > 0)
+       {
+               sid = malloc(num_sids * sizeof(DOM_SID));
+               if (mem_grp != NULL && sid != NULL)
+               {
+                       int i;
+                       for (i = 0; i < num_sids; i++)
+                       {
+                               make_dom_sid2(&sid[i], &mem_grp[i].sid);
+                       }
+                       free(mem_grp);
+               }
+       }
+
+       make_samr_r_query_aliasmem(&r_u, num_sids, sid, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_aliasmem("", &r_u, rdata, 0);
+
+       if (sid != NULL)
+       {
+               free(sid);
+       }
+
+       DEBUG(5,("samr_query_aliasmem: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_aliasmem
+ ********************************************************************/
+static void api_samr_query_aliasmem( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_ALIASMEM q_u;
+       samr_io_q_query_aliasmem("", &q_u, data, 0);
+       samr_reply_query_aliasmem(&q_u, rdata);
+}
+
+/*******************************************************************
+ samr_reply_lookup_names
+ ********************************************************************/
+static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
+                               prs_struct *rdata)
+{
+       uint32 rid [MAX_SAM_ENTRIES];
+       uint8  type[MAX_SAM_ENTRIES];
+       uint32 status     = 0;
+       int i;
+       int num_rids = q_u->num_names1;
+       DOM_SID pol_sid;
+
+       SAMR_R_LOOKUP_NAMES r_u;
+
+       DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &pol_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       if (num_rids > MAX_SAM_ENTRIES)
+       {
+               num_rids = MAX_SAM_ENTRIES;
+               DEBUG(5,("samr_lookup_names: truncating entries to %d\n", num_rids));
+       }
+
+       SMB_ASSERT_ARRAY(q_u->uni_name, num_rids);
+
+       for (i = 0; i < num_rids && status == 0; i++)
+       {
+               DOM_SID sid;
+               fstring name;
+               fstrcpy(name, unistr2_to_str(&q_u->uni_name[i]));
+
+               status = lookup_name(name, &sid, &(type[i]));
+               if (status == 0x0)
+               {
+                       sid_split_rid(&sid, &rid[i]);
+               }
+               else
+               {
+                       type[i] = SID_NAME_UNKNOWN;
+                       rid [i] = 0xffffffff;
+               }
+               if (!sid_equal(&pol_sid, &sid))
+               {
+                       rid [i] = 0xffffffff;
+                       type[i] = SID_NAME_UNKNOWN;
+               }
+       }
+
+       make_samr_r_lookup_names(&r_u, num_rids, rid, type, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_lookup_names("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_lookup_names
+ ********************************************************************/
+static void api_samr_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_LOOKUP_NAMES q_u;
+       samr_io_q_lookup_names("", &q_u, data, 0);
+       samr_reply_lookup_names(&q_u, rdata);
+}
+
+/*******************************************************************
+ samr_reply_chgpasswd_user
+ ********************************************************************/
+static void samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_CHGPASSWD_USER r_u;
+       uint32 status = 0x0;
+       fstring user_name;
+       fstring wks;
+
+       fstrcpy(user_name, unistr2_to_str(&q_u->uni_user_name));
+       fstrcpy(wks      , unistr2_to_str(&q_u->uni_dest_host));
+
+       DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
+
+       if (!pass_oem_change(user_name,
+                            q_u->lm_newpass.pass, q_u->lm_oldhash.hash,
+                            q_u->nt_newpass.pass, q_u->nt_oldhash.hash))
+       {
+               status = 0xC0000000 | NT_STATUS_WRONG_PASSWORD;
+       }
+
+       make_samr_r_chgpasswd_user(&r_u, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_chgpasswd_user("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_chgpasswd_user: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ api_samr_chgpasswd_user
+ ********************************************************************/
+static void api_samr_chgpasswd_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_CHGPASSWD_USER q_u;
+       samr_io_q_chgpasswd_user("", &q_u, data, 0);
+       samr_reply_chgpasswd_user(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_unknown_38
+ ********************************************************************/
+static void samr_reply_unknown_38(SAMR_Q_UNKNOWN_38 *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_UNKNOWN_38 r_u;
+
+       DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+
+       make_samr_r_unknown_38(&r_u);
+
+       /* store the response in the SMB stream */
+       samr_io_r_unknown_38("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ api_samr_unknown_38
+ ********************************************************************/
+static void api_samr_unknown_38( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_UNKNOWN_38 q_u;
+       samr_io_q_unknown_38("", &q_u, data, 0);
+       samr_reply_unknown_38(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_lookup_rids
+ ********************************************************************/
+static void samr_reply_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u,
+                               prs_struct *rdata)
+{
+       fstring group_names[MAX_SAM_ENTRIES];
+       uint8   group_attrs[MAX_SAM_ENTRIES];
+       uint32 status     = 0;
+       int num_rids = q_u->num_rids1;
+       DOM_SID pol_sid;
+
+       SAMR_R_LOOKUP_RIDS r_u;
+
+       DEBUG(5,("samr_lookup_rids: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &pol_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       if (status == 0x0)
+       {
+               int i;
+               if (num_rids > MAX_SAM_ENTRIES)
+               {
+                       num_rids = MAX_SAM_ENTRIES;
+                       DEBUG(5,("samr_lookup_rids: truncating entries to %d\n", num_rids));
+               }
+
+               for (i = 0; i < num_rids && status == 0; i++)
+               {
+                       DOM_SID sid;
+                       sid_copy(&sid, &pol_sid);
+                       sid_append_rid(&sid, q_u->rid[i]);
+                       lookup_sid(&sid, group_names[i], &group_attrs[i]);
+               }
+       }
+
+       make_samr_r_lookup_rids(&r_u, num_rids, group_names, group_attrs, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_lookup_rids("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_lookup_rids: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_lookup_rids
+ ********************************************************************/
+static void api_samr_lookup_rids( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_LOOKUP_RIDS q_u;
+       samr_io_q_lookup_rids("", &q_u, data, 0);
+       samr_reply_lookup_rids(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_open_user
+ ********************************************************************/
+static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
+                               prs_struct *rdata,
+                               int status)
+{
+       SAMR_R_OPEN_USER r_u;
+       struct sam_passwd *sam_pass;
+       BOOL pol_open = False;
+
+       /* set up the SAMR open_user response */
+       bzero(r_u.user_pol.data, POL_HND_SIZE);
+
+       r_u.status = 0x0;
+
+       /* find the policy handle.  open a policy on it. */
+       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->domain_pol)) == -1))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* get a (unique) handle.  open a policy on it. */
+       if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.user_pol))))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       become_root(True);
+       sam_pass = getsam21pwrid(q_u->user_rid);
+       unbecome_root(True);
+
+       /* check that the RID exists in our domain. */
+       if (r_u.status == 0x0 && sam_pass == NULL)
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+       }
+
+       /* associate the RID with the (unique) handle. */
+       if (r_u.status == 0x0 && !set_lsa_policy_samr_rid(&(r_u.user_pol), q_u->user_rid))
+       {
+               /* oh, whoops.  don't know what error message to return, here */
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (r_u.status != 0 && pol_open)
+       {
+               close_lsa_policy_hnd(&(r_u.user_pol));
+       }
+
+       DEBUG(5,("samr_open_user: %d\n", __LINE__));
+
+       /* store the response in the SMB stream */
+       samr_io_r_open_user("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_open_user: %d\n", __LINE__));
+
+}
 
 /*******************************************************************
- api_samr_lookup_names
+ api_samr_open_user
  ********************************************************************/
-static void api_samr_lookup_names( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_open_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_LOOKUP_NAMES q_u;
+       SAMR_Q_OPEN_USER q_u;
+       samr_io_q_open_user("", &q_u, data, 0);
+       samr_reply_open_user(&q_u, rdata, 0x0);
+}
 
-       /* grab the samr lookup names */
-       samr_io_q_lookup_names("", &q_u, data, 0);
 
-       /* construct reply.  always indicate success */
-       samr_reply_lookup_names(&q_u, rdata);
+/*************************************************************************
+ get_user_info_10
+ *************************************************************************/
+static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
+{
+       struct sam_passwd *sam_pass;
+
+       become_root(True);
+       sam_pass = getsam21pwrid(user_rid);
+       unbecome_root(True);
+
+       if (sam_pass == NULL)
+       {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
+               return False;
+       }
+
+       DEBUG(3,("User:[%s]\n", sam_pass->nt_name));
+
+       make_sam_user_info10(id10, sam_pass->acct_ctrl); 
+
+       return True;
 }
 
+/*************************************************************************
+ get_user_info_21
+ *************************************************************************/
+static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
+{
+       struct sam_passwd *sam_pass;
+       LOGON_HRS hrs;
+       int i;
+
+       become_root(True);
+       sam_pass = getsam21pwrid(user_rid);
+       unbecome_root(True);
+
+       if (sam_pass == NULL)
+       {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
+               return False;
+       }
+
+       DEBUG(3,("User:[%s]\n", sam_pass->nt_name));
+
+       /* create a LOGON_HRS structure */
+       hrs.len = sam_pass->hours_len;
+       SMB_ASSERT_ARRAY(hrs.hours, hrs.len);
+       for (i = 0; i < hrs.len; i++)
+       {
+               hrs.hours[i] = sam_pass->hours[i];
+       }
+
+       make_sam_user_info21(id21,
+
+                          &sam_pass->logon_time,
+                          &sam_pass->logoff_time,
+                          &sam_pass->kickoff_time,
+                          &sam_pass->pass_last_set_time,
+                          &sam_pass->pass_can_change_time,
+                          &sam_pass->pass_must_change_time,
+
+                          sam_pass->nt_name, /* user_name */
+                          sam_pass->full_name, /* full_name */
+                          sam_pass->home_dir, /* home_dir */
+                          sam_pass->dir_drive, /* dir_drive */
+                          sam_pass->logon_script, /* logon_script */
+                          sam_pass->profile_path, /* profile_path */
+                          sam_pass->acct_desc, /* description */
+                          sam_pass->workstations, /* workstations user can log in from */
+                          sam_pass->unknown_str, /* don't know, yet */
+                          sam_pass->munged_dial, /* dialin info.  contains dialin path and tel no */
+
+                          sam_pass->user_rid, /* RID user_id */
+                          sam_pass->group_rid, /* RID group_id */
+                          sam_pass->acct_ctrl,
+
+                          sam_pass->unknown_3, /* unknown_3 */
+                          sam_pass->logon_divs, /* divisions per week */
+                          &hrs, /* logon hours */
+                          sam_pass->unknown_5,
+                          sam_pass->unknown_6);
+
+       return True;
+}
 
 /*******************************************************************
- samr_reply_unknown_12
+ samr_reply_query_userinfo
  ********************************************************************/
-static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
+static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
                                prs_struct *rdata)
 {
-       fstring group_names[MAX_SAM_ENTRIES];
-       uint32  group_attrs[MAX_SAM_ENTRIES];
-       uint32 status     = 0;
-       int num_gids = q_u->num_gids1;
-       uint32 pol_idx;
+       SAMR_R_QUERY_USERINFO r_u;
+#if 0
+       SAM_USER_INFO_11 id11;
+#endif
+       SAM_USER_INFO_10 id10;
+       SAM_USER_INFO_21 id21;
+       void *info = NULL;
+
+       uint32 status = 0x0;
+       uint32 rid = 0x0;
+
+       DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
+
+       /* search for the handle */
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* find the user's rid */
+       if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->pol))) == 0xffffffff)
+       {
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       DEBUG(5,("samr_reply_query_userinfo: rid:0x%x\n", rid));
+
+       /* ok!  user info levels (there are lots: see MSDEV help), off we go... */
+       if (status == 0x0)
+       {
+               switch (q_u->switch_value)
+               {
+                       case 0x10:
+                       {
+                               info = (void*)&id10;
+                               status = get_user_info_10(&id10, rid) ? 0 : (0xC0000000 | NT_STATUS_NO_SUCH_USER);
+                               break;
+                       }
+#if 0
+/* whoops - got this wrong.  i think.  or don't understand what's happening. */
+                       case 0x11:
+                       {
+                               NTTIME expire;
+                               info = (void*)&id11;
+                               
+                               expire.low  = 0xffffffff;
+                               expire.high = 0x7fffffff;
+
+                               make_sam_user_info11(&id11, &expire, "BROOKFIELDS$", 0x03ef, 0x201, 0x0080);
+
+                               break;
+                       }
+#endif
+                       case 21:
+                       {
+                               info = (void*)&id21;
+                               status = get_user_info_21(&id21, rid) ? 0 : (0xC0000000 | NT_STATUS_NO_SUCH_USER);
+                               break;
+                       }
+
+                       default:
+                       {
+                               status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
+
+                               break;
+                       }
+               }
+       }
+
+       make_samr_r_query_userinfo(&r_u, q_u->switch_value, info, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_userinfo("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_userinfo
+ ********************************************************************/
+static void api_samr_query_userinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_USERINFO q_u;
+       samr_io_q_query_userinfo("", &q_u, data, 0);
+       samr_reply_query_userinfo(&q_u, rdata);
+}
+
 
-       SAMR_R_UNKNOWN_12 r_u;
+/*******************************************************************
+ samr_reply_query_usergroups
+ ********************************************************************/
+static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_QUERY_USERGROUPS r_u;
+       uint32 status = 0x0;
 
-       DEBUG(5,("samr_unknown_12: %d\n", __LINE__));
+       struct sam_passwd *sam_pass;
+       DOM_GID *gids = NULL;
+       int num_groups = 0;
+       uint32 rid;
+
+       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
+       /* find the user's rid */
+       if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->pol))) == 0xffffffff)
+       {
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
        if (status == 0x0)
        {
-               int i;
-               if (num_gids > MAX_SAM_ENTRIES)
+               become_root(True);
+               sam_pass = getsam21pwrid(rid);
+               unbecome_root(True);
+
+               if (sam_pass == NULL)
                {
-                       num_gids = MAX_SAM_ENTRIES;
-                       DEBUG(5,("samr_unknown_12: truncating entries to %d\n", num_gids));
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
                }
+       }
+
+       if (status == 0x0)
+       {
+               DOMAIN_GRP *mem_grp = NULL;
+
+               become_root(True);
+               getusergroupsntnam(sam_pass->nt_name, &mem_grp, &num_groups);
+               unbecome_root(True);
+
+                gids = NULL;
+               num_groups = make_dom_gids(mem_grp, num_groups, &gids);
 
-               for (i = 0; i < num_gids && status == 0; i++)
+               if (mem_grp != NULL)
                {
-                       fstrcpy(group_names[i], "dummy group");
-                       group_attrs[i] = 0x2;
+                       free(mem_grp);
                }
        }
 
-       make_samr_r_unknown_12(&r_u, num_gids, group_names, group_attrs, status);
+       /* construct the response.  lkclXXXX: gids are not copied! */
+       make_samr_r_query_usergroups(&r_u, num_groups, gids, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_unknown_12("", &r_u, rdata, 0);
+       samr_io_r_query_usergroups("", &r_u, rdata, 0);
 
-       DEBUG(5,("samr_unknown_12: %d\n", __LINE__));
+       if (gids)
+       {
+               free((char *)gids);
+       }
+
+       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
 
 }
 
 /*******************************************************************
- api_samr_unknown_12
+ api_samr_query_usergroups
  ********************************************************************/
-static void api_samr_unknown_12( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_query_usergroups( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_UNKNOWN_12 q_u;
-
-       /* grab the samr lookup names */
-       samr_io_q_unknown_12("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
-       samr_reply_unknown_12(&q_u, rdata);
+       SAMR_Q_QUERY_USERGROUPS q_u;
+       samr_io_q_query_usergroups("", &q_u, data, 0);
+       samr_reply_query_usergroups(&q_u, rdata);
 }
 
 
 /*******************************************************************
- samr_reply_open_user
+ opens a samr alias by rid, returns a policy handle.
  ********************************************************************/
-static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
-                               prs_struct *rdata,
-                               int status)
+static uint32 open_samr_alias(DOM_SID *sid, POLICY_HND *alias_pol,
+                               uint32 alias_rid)
 {
-       SAMR_R_OPEN_USER r_u;
-       struct smb_passwd *smb_pass;
-       int pol_idx;
        BOOL pol_open = False;
+       uint32 status = 0x0;
 
-       /* set up the SAMR open_user response */
-       bzero(&(r_u.user_pol.data), POL_HND_SIZE);
+       /* get a (unique) handle.  open a policy on it. */
+       if (status == 0x0 && !(pol_open = open_lsa_policy_hnd(alias_pol)))
+       {
+               status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
 
-       r_u.status = 0x0;
+       DEBUG(0,("TODO: verify that the alias rid exists\n"));
 
-       /* find the policy handle.  open a policy on it. */
-       if (r_u.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->domain_pol))) == -1))
+       /* associate a RID with the (unique) handle. */
+       if (status == 0x0 && !set_lsa_policy_samr_rid(alias_pol, alias_rid))
        {
-               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+               /* oh, whoops.  don't know what error message to return, here */
+               status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       /* get a (unique) handle.  open a policy on it. */
-       if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.user_pol))))
+       sid_append_rid(sid, alias_rid);
+
+       /* associate an alias SID with the (unique) handle. */
+       if (status == 0x0 && !set_lsa_policy_samr_sid(alias_pol, sid))
        {
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               /* oh, whoops.  don't know what error message to return, here */
+               status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       become_root(True);
-       smb_pass = getsampwuid(q_u->user_rid);
-       unbecome_root(True);
+       if (status != 0 && pol_open)
+       {
+               close_lsa_policy_hnd(alias_pol);
+       }
 
-       /* check that the RID exists in our domain. */
-       if (r_u.status == 0x0 && smb_pass == NULL)
+       return status;
+}
+
+/*******************************************************************
+ samr_reply_create_dom_alias
+ ********************************************************************/
+static void samr_reply_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_CREATE_DOM_ALIAS r_u;
+       DOM_SID dom_sid;
+       LOCAL_GRP grp;
+       POLICY_HND alias_pol;
+       uint32 status = 0x0;
+
+       bzero(&alias_pol, sizeof(alias_pol));
+
+       DEBUG(5,("samr_create_dom_alias: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->dom_pol)) == -1))
        {
-               r_u.status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-       /* associate the RID with the (unique) handle. */
-       if (r_u.status == 0x0 && !set_lsa_policy_samr_rid(&(r_u.user_pol), q_u->user_rid))
+       /* find the domain sid */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->dom_pol, &dom_sid))
        {
-               /* oh, whoops.  don't know what error message to return, here */
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       if (!sid_equal(&dom_sid, &global_sam_sid))
+       {
+               status = 0xC0000000 | NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (status == 0x0)
+       {
+               fstrcpy(grp.name, unistr2_to_str(&q_u->uni_acct_desc));
+               fstrcpy(grp.comment, "");
+               grp.rid = 0xffffffff;
+
+               become_root(True);
+               status = add_alias_entry(&grp) ? 0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+               unbecome_root(True);
        }
 
-       if (r_u.status != 0 && pol_open)
+       if (status == 0x0)
        {
-               close_lsa_policy_hnd(&(r_u.user_pol));
+               status = open_samr_alias(&dom_sid, &alias_pol, grp.rid);
        }
 
-       DEBUG(5,("samr_open_user: %d\n", __LINE__));
+       /* construct the response. */
+       make_samr_r_create_dom_alias(&r_u, &alias_pol, grp.rid, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_open_user("", &r_u, rdata, 0);
+       samr_io_r_create_dom_alias("", &r_u, rdata, 0);
 
-       DEBUG(5,("samr_open_user: %d\n", __LINE__));
+       DEBUG(5,("samr_create_dom_alias: %d\n", __LINE__));
 
 }
 
 /*******************************************************************
- api_samr_open_user
+ api_samr_create_dom_alias
  ********************************************************************/
-static void api_samr_open_user( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_create_dom_alias( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_OPEN_USER q_u;
-
-       /* grab the samr unknown 22 */
-       samr_io_q_open_user("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
-       samr_reply_open_user(&q_u, rdata, 0x0);
+       SAMR_Q_CREATE_DOM_ALIAS q_u;
+       samr_io_q_create_dom_alias("", &q_u, data, 0);
+       samr_reply_create_dom_alias(&q_u, rdata);
 }
 
 
-/*************************************************************************
- get_user_info_21
- *************************************************************************/
-static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
+/*******************************************************************
+ opens a samr group by rid, returns a policy handle.
+ ********************************************************************/
+static uint32 open_samr_group(DOM_SID *sid, POLICY_HND *group_pol,
+                               uint32 group_rid)
 {
-       NTTIME dummy_time;
-       struct sam_passwd *sam_pass;
-
-       LOGON_HRS hrs;
-       int i;
-
-       become_root(True);
-       sam_pass = getsam21pwrid(rid);
-       unbecome_root(True);
+       BOOL pol_open = False;
+       uint32 status = 0x0;
 
-       if (sam_pass == NULL)
+       /* get a (unique) handle.  open a policy on it. */
+       if (status == 0x0 && !(pol_open = open_lsa_policy_hnd(group_pol)))
        {
-               return False;
+               status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       DEBUG(3,("User:[%s]\n", sam_pass->smb_name));
-
-       dummy_time.low  = 0xffffffff;
-       dummy_time.high = 0x7fffffff;
+       DEBUG(0,("TODO: verify that the group rid exists\n"));
 
-       DEBUG(0,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
-
-       /* create a LOGON_HRS structure */
-       hrs.len = sam_pass->hours_len;
-       for (i = 0; i < hrs.len; i++)
+       /* associate a RID with the (unique) handle. */
+       if (status == 0x0 && !set_lsa_policy_samr_rid(group_pol, group_rid))
        {
-               hrs.hours[i] = sam_pass->hours[i];
+               /* oh, whoops.  don't know what error message to return, here */
+               status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       make_sam_user_info21(id21,
-
-                          &dummy_time, /* logon_time */
-                          &dummy_time, /* logoff_time */
-                          &dummy_time, /* kickoff_time */
-                          &dummy_time, /* pass_last_set_time */
-                          &dummy_time, /* pass_can_change_time */
-                          &dummy_time, /* pass_must_change_time */
-
-                          sam_pass->smb_name, /* user_name */
-                          sam_pass->full_name, /* full_name */
-                          sam_pass->home_dir, /* home_dir */
-                          sam_pass->dir_drive, /* dir_drive */
-                          sam_pass->logon_script, /* logon_script */
-                          sam_pass->profile_path, /* profile_path */
-                          sam_pass->acct_desc, /* description */
-                          sam_pass->workstations, /* workstations user can log in from */
-                          sam_pass->unknown_str, /* don't know, yet */
-                          sam_pass->munged_dial, /* dialin info.  contains dialin path and tel no */
+       sid_append_rid(sid, group_rid);
 
-                          sam_pass->user_rid, /* RID user_id */
-                          sam_pass->group_rid, /* RID group_id */
-                      sam_pass->acct_ctrl,
+       /* associate an group SID with the (unique) handle. */
+       if (status == 0x0 && !set_lsa_policy_samr_sid(group_pol, sid))
+       {
+               /* oh, whoops.  don't know what error message to return, here */
+               status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
 
-                  sam_pass->unknown_3, /* unknown_3 */
-                      sam_pass->logon_divs, /* divisions per week */
-                          &hrs, /* logon hours */
-                      sam_pass->unknown_5,
-                      sam_pass->unknown_6);
+       if (status != 0 && pol_open)
+       {
+               close_lsa_policy_hnd(group_pol);
+       }
 
-       return True;
+       return status;
 }
 
 /*******************************************************************
- samr_reply_query_userinfo
+ samr_reply_create_dom_group
  ********************************************************************/
-static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
+static void samr_reply_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_QUERY_USERINFO r_u;
-#if 0
-       SAM_USER_INFO_11 id11;
-#endif
-       SAM_USER_INFO_21 id21;
-       void *info = NULL;
-
+       SAMR_R_CREATE_DOM_GROUP r_u;
+       DOM_SID dom_sid;
+       DOMAIN_GRP grp;
+       POLICY_HND group_pol;
        uint32 status = 0x0;
-       uint32 rid;
-       int obj_idx;
 
-       DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
+       bzero(&group_pol, sizeof(group_pol));
 
-       /* search for the handle */
-       if (status == 0x0 && (obj_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1)
+       DEBUG(5,("samr_create_dom_group: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
-               status = NT_STATUS_INVALID_HANDLE;
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-       /* find the user's rid */
-       if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->pol))) == 0xffffffff)
+       /* find the domain sid */
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &dom_sid))
        {
-               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
+               status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
        }
 
-       /* ok!  user info levels (there are lots: see MSDEV help), off we go... */
-       if (status == 0x0)
+       if (!sid_equal(&dom_sid, &global_sam_sid))
        {
-               switch (q_u->switch_value)
-               {
-#if 0
-/* whoops - got this wrong.  i think.  or don't understand what's happening. */
-                       case 0x11:
-                       {
-                               NTTIME expire;
-                               info = (void*)&id11;
-                               
-                               expire.low  = 0xffffffff;
-                               expire.high = 0x7fffffff;
-
-                               make_sam_user_info11(&id11, &expire, "BROOKFIELDS$", 0x03ef, 0x201, 0x0080);
+               status = 0xC0000000 | NT_STATUS_ACCESS_DENIED;
+       }
 
-                               break;
-                       }
-#endif
-                       case 21:
-                       {
-                               info = (void*)&id21;
-                               status = get_user_info_21(&id21, rid) ? 0 : NT_STATUS_NO_SUCH_USER;
-                               break;
-                       }
+       if (status == 0x0)
+       {
+               fstrcpy(grp.name, unistr2_to_str(&q_u->uni_acct_desc));
+               fstrcpy(grp.comment, "");
+               grp.rid = 0xffffffff;
+               grp.attr = 0x07;
 
-                       default:
-                       {
-                               status = NT_STATUS_INVALID_INFO_CLASS;
+               become_root(True);
+               status = add_group_entry(&grp) ? 0x0 : (0xC0000000 | NT_STATUS_ACCESS_DENIED);
+               unbecome_root(True);
+       }
 
-                               break;
-                       }
-               }
+       if (status == 0x0)
+       {
+               status = open_samr_group(&dom_sid, &group_pol, grp.rid);
        }
 
-       make_samr_r_query_userinfo(&r_u, q_u->switch_value, info, status);
+       /* construct the response. */
+       make_samr_r_create_dom_group(&r_u, &group_pol, grp.rid, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_query_userinfo("", &r_u, rdata, 0);
+       samr_io_r_create_dom_group("", &r_u, rdata, 0);
 
-       DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
+       DEBUG(5,("samr_create_dom_group: %d\n", __LINE__));
 
 }
 
 /*******************************************************************
- api_samr_query_userinfo
+ api_samr_create_dom_group
  ********************************************************************/
-static void api_samr_query_userinfo( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_create_dom_group( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_QUERY_USERINFO q_u;
-
-       /* grab the samr unknown 24 */
-       samr_io_q_query_userinfo("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
-       samr_reply_query_userinfo(&q_u, rdata);
+       SAMR_Q_CREATE_DOM_GROUP q_u;
+       samr_io_q_create_dom_group("", &q_u, data, 0);
+       samr_reply_create_dom_group(&q_u, rdata);
 }
 
 
 /*******************************************************************
- samr_reply_query_usergroups
+ samr_reply_query_dom_info
  ********************************************************************/
-static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
+static void samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_QUERY_USERGROUPS r_u;
+       SAMR_R_QUERY_DOMAIN_INFO r_u;
+       SAM_UNK_CTR ctr;
+       uint16 switch_value = 0x0;
        uint32 status = 0x0;
 
-       struct smb_passwd *smb_pass;
-       DOM_GID *gids = NULL;
-       int num_groups = 0;
-       int pol_idx;
-       uint32 rid;
+       ZERO_STRUCT(r_u);
+       ZERO_STRUCT(ctr);
 
-       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
+       r_u.ctr = &ctr;
 
-       /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
-       {
-               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
+       DEBUG(5,("samr_reply_query_dom_info: %d\n", __LINE__));
 
-       /* find the user's rid */
-       if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->pol))) == 0xffffffff)
+       /* find the policy handle.  open a policy on it. */
+       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->domain_pol)) == -1))
        {
-               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
+               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+               DEBUG(5,("samr_reply_query_dom_info: invalid handle\n"));
        }
 
        if (status == 0x0)
        {
-               become_root(True);
-               smb_pass = getsampwuid(rid);
-               unbecome_root(True);
-
-               if (smb_pass == NULL)
+               switch (q_u->switch_value)
                {
-                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-               }
-       }
+                       case 0x06:
+                       {
+                               switch_value = 0x6;
+                               make_unk_info6(&ctr.info.inf6);
 
-       if (status == 0x0)
-       {
-               pstring groups;
-               get_domain_user_groups(groups, smb_pass->smb_name);
-                gids = NULL;
-               num_groups = make_dom_gids(groups, &gids);
+                               break;
+                       }
+                       case 0x07:
+                       {
+                               switch_value = 0x7;
+                               make_unk_info7(&ctr.info.inf7);
+
+                               break;
+                       }
+                       case 0x02:
+                       {
+                               switch_value = 0x2;
+                               make_unk_info2(&ctr.info.inf2, global_sam_name, global_myname);
+
+                               break;
+                       }
+                       default:
+                       {
+                               status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
+                               break;
+                       }
+               }
        }
 
-       /* construct the response.  lkclXXXX: gids are not copied! */
-       make_samr_r_query_usergroups(&r_u, num_groups, gids, status);
+       make_samr_r_query_dom_info(&r_u, switch_value, &ctr, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_query_usergroups("", &r_u, rdata, 0);
+       samr_io_r_query_dom_info("", &r_u, rdata, 0);
 
-        if(gids)
-          free((char *)gids);
-       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
+       DEBUG(5,("samr_query_dom_info: %d\n", __LINE__));
 
 }
 
 /*******************************************************************
- api_samr_query_usergroups
+ api_samr_query_dom_info
  ********************************************************************/
-static void api_samr_query_usergroups( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_query_dom_info( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_QUERY_USERGROUPS q_u;
-       /* grab the samr unknown 32 */
-       samr_io_q_query_usergroups("", &q_u, data, 0);
-
-       /* construct reply. */
-       samr_reply_query_usergroups(&q_u, rdata);
+       SAMR_Q_QUERY_DOMAIN_INFO q_e;
+       samr_io_q_query_dom_info("", &q_e, data, 0);
+       samr_reply_query_dom_info(&q_e, rdata);
 }
 
 
+
 /*******************************************************************
  samr_reply_unknown_32
  ********************************************************************/
@@ -1096,7 +2261,7 @@ static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
        SAMR_R_UNKNOWN_32 r_u;
 
        /* set up the SAMR unknown_32 response */
-       bzero(&(r_u.pol.data), POL_HND_SIZE);
+       bzero(r_u.pol.data, POL_HND_SIZE);
        if (status == 0)
        {
                for (i = 4; i < POL_HND_SIZE; i++)
@@ -1120,10 +2285,10 @@ static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
 /*******************************************************************
  api_samr_unknown_32
  ********************************************************************/
-static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_unknown_32( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
        uint32 status = 0;
-       struct smb_passwd *smb_pass;
+       struct sam_passwd *sam_pass;
        fstring mach_acct;
 
        SAMR_Q_UNKNOWN_32 q_u;
@@ -1137,14 +2302,13 @@ static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
           reply if the account already exists...
         */
 
-       fstrcpy(mach_acct, unistrn2(q_u.uni_mach_acct.buffer,
-                                   q_u.uni_mach_acct.uni_str_len));
+       fstrcpy(mach_acct, unistr2_to_str(&q_u.uni_mach_acct));
 
        become_root(True);
-       smb_pass = getsampwnam(mach_acct);
+       sam_pass = getsam21pwntnam(mach_acct);
        unbecome_root(True);
 
-       if (smb_pass != NULL)
+       if (sam_pass != NULL)
        {
                /* machine account exists: say so */
                status = 0xC0000000 | NT_STATUS_USER_EXISTS;
@@ -1152,6 +2316,7 @@ static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
        else
        {
                /* this could cause trouble... */
+               DEBUG(0,("trouble!\n"));
                status = 0;
        }
 
@@ -1160,6 +2325,55 @@ static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
 }
 
 
+/*******************************************************************
+ samr_reply_connect_anon
+ ********************************************************************/
+static void samr_reply_connect_anon(SAMR_Q_CONNECT_ANON *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_CONNECT_ANON r_u;
+       BOOL pol_open = False;
+
+       /* set up the SAMR connect_anon response */
+
+       r_u.status = 0x0;
+       /* get a (unique) handle.  open a policy on it. */
+       if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.connect_pol))))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       /* associate the domain SID with the (unique) handle. */
+       if (r_u.status == 0x0 && !set_lsa_policy_samr_pol_status(&(r_u.connect_pol), q_u->unknown_0))
+       {
+               /* oh, whoops.  don't know what error message to return, here */
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (r_u.status != 0 && pol_open)
+       {
+               close_lsa_policy_hnd(&(r_u.connect_pol));
+       }
+
+       DEBUG(5,("samr_connect_anon: %d\n", __LINE__));
+
+       /* store the response in the SMB stream */
+       samr_io_r_connect_anon("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_connect_anon: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_connect_anon
+ ********************************************************************/
+static void api_samr_connect_anon( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_CONNECT_ANON q_u;
+       samr_io_q_connect_anon("", &q_u, data, 0);
+       samr_reply_connect_anon(&q_u, rdata);
+}
+
 /*******************************************************************
  samr_reply_connect
  ********************************************************************/
@@ -1202,14 +2416,10 @@ static void samr_reply_connect(SAMR_Q_CONNECT *q_u,
 /*******************************************************************
  api_samr_connect
  ********************************************************************/
-static void api_samr_connect( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_connect( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
        SAMR_Q_CONNECT q_u;
-
-       /* grab the samr open policy */
        samr_io_q_connect("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
        samr_reply_connect(&q_u, rdata);
 }
 
@@ -1220,17 +2430,25 @@ static void samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_OPEN_ALIAS r_u;
+       DOM_SID sid;
        BOOL pol_open = False;
 
        /* set up the SAMR open_alias response */
 
        r_u.status = 0x0;
+       if (r_u.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->dom_pol, &sid))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
        /* get a (unique) handle.  open a policy on it. */
        if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.pol))))
        {
                r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
+       DEBUG(0,("TODO: verify that the alias rid exists\n"));
+
        /* associate a RID with the (unique) handle. */
        if (r_u.status == 0x0 && !set_lsa_policy_samr_rid(&(r_u.pol), q_u->rid_alias))
        {
@@ -1238,6 +2456,15 @@ static void samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
                r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
+       sid_append_rid(&sid, q_u->rid_alias);
+
+       /* associate an alias SID with the (unique) handle. */
+       if (r_u.status == 0x0 && !set_lsa_policy_samr_sid(&(r_u.pol), &sid))
+       {
+               /* oh, whoops.  don't know what error message to return, here */
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
        if (r_u.status != 0 && pol_open)
        {
                close_lsa_policy_hnd(&(r_u.pol));
@@ -1255,18 +2482,61 @@ static void samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
 /*******************************************************************
  api_samr_open_alias
  ********************************************************************/
-static void api_samr_open_alias( int uid, prs_struct *data, prs_struct *rdata)
+static void api_samr_open_alias( uint16 vuid, prs_struct *data, prs_struct *rdata)
                                 
 {
        SAMR_Q_OPEN_ALIAS q_u;
-
-       /* grab the samr open policy */
        samr_io_q_open_alias("", &q_u, data, 0);
-
-       /* construct reply.  always indicate success */
        samr_reply_open_alias(&q_u, rdata);
 }
 
+/*******************************************************************
+ samr_reply_open_group
+ ********************************************************************/
+static void samr_reply_open_group(SAMR_Q_OPEN_GROUP *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_OPEN_GROUP r_u;
+       DOM_SID sid;
+
+       DEBUG(5,("samr_open_group: %d\n", __LINE__));
+
+       r_u.status = 0x0;
+
+       /* find the domain sid associated with the policy handle */
+       if (r_u.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->domain_pol, &sid))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (r_u.status == 0x0 && !sid_equal(&sid, &global_sam_sid))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (r_u.status == 0x0)
+       {
+               r_u.status = open_samr_group(&sid, &r_u.pol, q_u->rid_group);
+       }
+
+       /* store the response in the SMB stream */
+       samr_io_r_open_group("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_open_group: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_open_group
+ ********************************************************************/
+static void api_samr_open_group( uint16 vuid, prs_struct *data, prs_struct *rdata)
+                                
+{
+       SAMR_Q_OPEN_GROUP q_u;
+       samr_io_q_open_group("", &q_u, data, 0);
+       samr_reply_open_group(&q_u, rdata);
+}
+
 /*******************************************************************
  array of \PIPE\samr operations
  ********************************************************************/
@@ -1274,22 +2544,39 @@ static struct api_struct api_samr_cmds [] =
 {
        { "SAMR_CLOSE_HND"        , SAMR_CLOSE_HND        , api_samr_close_hnd        },
        { "SAMR_CONNECT"          , SAMR_CONNECT          , api_samr_connect          },
+       { "SAMR_CONNECT_ANON"     , SAMR_CONNECT_ANON     , api_samr_connect_anon     },
        { "SAMR_ENUM_DOM_USERS"   , SAMR_ENUM_DOM_USERS   , api_samr_enum_dom_users   },
        { "SAMR_ENUM_DOM_GROUPS"  , SAMR_ENUM_DOM_GROUPS  , api_samr_enum_dom_groups  },
        { "SAMR_ENUM_DOM_ALIASES" , SAMR_ENUM_DOM_ALIASES , api_samr_enum_dom_aliases },
-       { "SAMR_LOOKUP_IDS"       , SAMR_LOOKUP_IDS       , api_samr_lookup_ids       },
+       { "SAMR_QUERY_USERALIASES", SAMR_QUERY_USERALIASES, api_samr_query_useraliases},
+       { "SAMR_QUERY_ALIASMEM"   , SAMR_QUERY_ALIASMEM   , api_samr_query_aliasmem   },
+       { "SAMR_QUERY_GROUPMEM"   , SAMR_QUERY_GROUPMEM   , api_samr_query_groupmem   },
+       { "SAMR_ADD_ALIASMEM"     , SAMR_ADD_ALIASMEM     , api_samr_add_aliasmem     },
+       { "SAMR_DEL_ALIASMEM"     , SAMR_DEL_ALIASMEM     , api_samr_del_aliasmem     },
+       { "SAMR_ADD_GROUPMEM"     , SAMR_ADD_GROUPMEM     , api_samr_add_groupmem     },
+       { "SAMR_DEL_GROUPMEM"     , SAMR_DEL_GROUPMEM     , api_samr_del_groupmem     },
+       { "SAMR_DELETE_DOM_GROUP" , SAMR_DELETE_DOM_GROUP , api_samr_delete_dom_group },
+       { "SAMR_DELETE_DOM_ALIAS" , SAMR_DELETE_DOM_ALIAS , api_samr_delete_dom_alias },
+       { "SAMR_CREATE_DOM_GROUP" , SAMR_CREATE_DOM_GROUP , api_samr_create_dom_group },
+       { "SAMR_CREATE_DOM_ALIAS" , SAMR_CREATE_DOM_ALIAS , api_samr_create_dom_alias },
        { "SAMR_LOOKUP_NAMES"     , SAMR_LOOKUP_NAMES     , api_samr_lookup_names     },
        { "SAMR_OPEN_USER"        , SAMR_OPEN_USER        , api_samr_open_user        },
        { "SAMR_QUERY_USERINFO"   , SAMR_QUERY_USERINFO   , api_samr_query_userinfo   },
+       { "SAMR_QUERY_DOMAIN_INFO", SAMR_QUERY_DOMAIN_INFO, api_samr_query_dom_info   },
        { "SAMR_QUERY_USERGROUPS" , SAMR_QUERY_USERGROUPS , api_samr_query_usergroups },
        { "SAMR_QUERY_DISPINFO"   , SAMR_QUERY_DISPINFO   , api_samr_query_dispinfo   },
        { "SAMR_QUERY_ALIASINFO"  , SAMR_QUERY_ALIASINFO  , api_samr_query_aliasinfo  },
-       { "SAMR_0x32"             , 0x32                  , api_samr_unknown_32       },
-       { "SAMR_UNKNOWN_12"       , SAMR_UNKNOWN_12       , api_samr_unknown_12       },
+       { "SAMR_QUERY_GROUPINFO"  , SAMR_QUERY_GROUPINFO  , api_samr_query_groupinfo  },
+       { "SAMR_0x32"             , SAMR_UNKNOWN_32       , api_samr_unknown_32       },
+       { "SAMR_LOOKUP_RIDS"      , SAMR_LOOKUP_RIDS      , api_samr_lookup_rids      },
+       { "SAMR_UNKNOWN_38"       , SAMR_UNKNOWN_38       , api_samr_unknown_38       },
+       { "SAMR_CHGPASSWD_USER"   , SAMR_CHGPASSWD_USER   , api_samr_chgpasswd_user   },
        { "SAMR_OPEN_ALIAS"       , SAMR_OPEN_ALIAS       , api_samr_open_alias       },
+       { "SAMR_OPEN_GROUP"       , SAMR_OPEN_GROUP       , api_samr_open_group       },
        { "SAMR_OPEN_DOMAIN"      , SAMR_OPEN_DOMAIN      , api_samr_open_domain      },
        { "SAMR_UNKNOWN_3"        , SAMR_UNKNOWN_3        , api_samr_unknown_3        },
-    { NULL                    , 0                     , NULL                      }
+       { "SAMR_UNKNOWN_2C"       , SAMR_UNKNOWN_2C       , api_samr_unknown_2c       },
+       { NULL                    , 0                     , NULL                      }
 };
 
 /*******************************************************************