adding group member code, made a start. found that the group members'
[samba.git] / source3 / rpc_server / srv_samr.c
index f82a1f5afebfd326e4e7ee8e8abba0a8730deaa8..505fad25b4ecce152bc3eacab961669b474d7850 100644 (file)
 
 extern int DEBUGLEVEL;
 
-extern BOOL sam_logon_in_ssb;
-extern pstring samlogon_user;
-extern DOM_SID global_machine_sid;
+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;
 
 extern rid_name domain_group_rids[];
 extern rid_name domain_alias_rids[];
+extern rid_name builtin_alias_rids[];
 
 /*******************************************************************
   This next function should be replaced with something that
@@ -74,10 +77,10 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
                        continue;
                }
 
-               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);
+               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);
 
@@ -90,7 +93,7 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
                pw_buf[(*num_entries)].acb_info = (uint16)pwd->acct_ctrl;
 
                DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x",
-                         (*num_entries), pwd->smb_name,
+                         (*num_entries), pwd->nt_name,
                          pwd->user_rid, pwd->acct_ctrl));
 
                if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask))
@@ -215,6 +218,53 @@ static void api_samr_open_domain( uint16 vuid, prs_struct *data, prs_struct *rda
 }
 
 
+/*******************************************************************
+ 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 = 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;
+
+       /* grab the samr open */
+       samr_io_q_unknown_2c("", &q_u, data, 0);
+
+       /* construct reply.  always indicate success */
+       samr_reply_unknown_2c(&q_u, rdata);
+}
+
+
 /*******************************************************************
  samr_reply_unknown_3
  ********************************************************************/
@@ -242,24 +292,21 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
 
        if (status == 0x0)
        {
-        DOM_SID user_sid;
-        DOM_SID other_sid;
-
-        user_sid = global_machine_sid;
+               DOM_SID usr_sid;
 
-       SMB_ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1);
+               usr_sid = global_sam_sid;
 
-        /*
-         * Add the user RID.
-         */
-        user_sid.sub_auths[user_sid.num_auths++] = rid;
-        
-               string_to_sid(&other_sid, "S-1-1");
+               SMB_ASSERT_ARRAY(usr_sid.sub_auths, usr_sid.num_auths+1);
 
-               /* maybe need another 1 or 2 (S-1-5-20-0x220 and S-1-5-20-0x224) */
+               /*
+                * 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, &other_sid);
-               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,
@@ -350,37 +397,81 @@ static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_ENUM_DOM_GROUPS r_e;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       BOOL got_grps;
-       char *dummy_group = "Domain Admins";
+       DOMAIN_GRP *grps = NULL;
+       int num_entries = 0;
+       BOOL got_grps = False;
+       DOM_SID sid;
+       fstring 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 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-       DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
+       sid_to_string(sid_str, &sid);
+
+       DEBUG(5,("samr_reply_enum_dom_groups: sid %s\n", sid_str));
+
+       if (sid_equal(&sid, &global_sam_sid))
+       {
+               BOOL ret;
+               got_grps = True;
+
+               become_root(True);
+               ret = enumdomgroups(&grps, &num_entries);
+               unbecome_root(True);
+
+               if (!ret)
+               {
+                       r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
+               }
+       }
+
+       if (r_e.status == 0x0 &&
+           (sid_equal(&sid, &global_sam_sid) ||
+            sid_equal(&sid, &global_sid_S_1_5_20)))
+       {
+               char *name;
+               int i = 0;
+               got_grps = True;
+
+               while (num_entries < MAX_SAM_ENTRIES && ((name = domain_group_rids[i].name) != NULL))
+               {
+                       DOMAIN_GRP tmp_grp;
+
+                       fstrcpy(tmp_grp.name   , name);
+                       fstrcpy(tmp_grp.comment, "");
+                       tmp_grp.rid = domain_group_rids[i].rid;
+                       tmp_grp.attr = 0x7;
+
+                       if (!add_domain_group(&grps, &num_entries, &tmp_grp))
+                       {
+                               r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
+                               break;
+                       }
 
-       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;
+                       i++;
+               }
+       }
 
        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);
+               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_enum_dom_groups("", &r_e, rdata, 0);
 
-       DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
+       if (grps != NULL)
+       {
+               free(grps);
+       }
 
+       DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
 }
 
 /*******************************************************************
@@ -405,35 +496,72 @@ static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_ENUM_DOM_ALIASES r_e;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       BOOL got_aliases;
-       char *dummy_alias = "admins";
+       LOCAL_GRP *alss = NULL;
+       int num_entries = 0;
+       DOM_SID sid;
+       fstring 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 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-       DEBUG(5,("samr_reply_enum_dom_aliases: %d\n", __LINE__));
+       sid_to_string(sid_str, &sid);
+
+       DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
+
+       /* well-known aliases */
+       if (sid_equal(&sid, &global_sid_S_1_5_20))
+       {
+               char *name;
+
+               while ((name = builtin_alias_rids[num_entries].name) != NULL)
+               {
+                       LOCAL_GRP tmp_als;
+
+                       fstrcpy(tmp_als.name   , name);
+                       fstrcpy(tmp_als.comment, "");
+                       tmp_als.rid = builtin_alias_rids[num_entries].rid;
 
-       got_aliases = True;
-       num_entries = 1;
-       make_unistr2(&(pass[0].uni_user_name), dummy_alias, strlen(dummy_alias));
-       pass[0].user_rid = BUILTIN_ALIAS_RID_ADMINS;
+                       if (!add_domain_alias(&alss, &num_entries, &tmp_als))
+                       {
+                               r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
+                               break;
+                       }
+               }
+       }
+       else if (sid_equal(&sid, &global_sam_sid))
+       {
+               BOOL ret;
+               /* local aliases */
+               num_entries = 0;
 
-       if (r_e.status == 0 && got_aliases)
+               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, pass, r_e.status);
+               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__));
 
 }
@@ -542,6 +670,166 @@ static void api_samr_query_dispinfo( uint16 vuid, prs_struct *data, prs_struct *
        samr_reply_query_dispinfo(&q_e, rdata);
 }
 
+#if 0
+/*******************************************************************
+ 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_USER;
+               }
+       }
+
+       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 (sid != NULL)
+       {
+               free(sid);
+       }
+
+       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;
+
+       /* grab the samr 0x19 */
+       samr_io_q_query_groupmem("", &q_u, data, 0);
+
+       /* construct reply.  always indicate success */
+       samr_reply_query_groupmem(&q_u, rdata);
+}
+
+#endif
+
+
+/*******************************************************************
+ 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_value = 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_value = 4;
+                       make_samr_group_info4(&ctr.group.info4, "<account description>");
+               }
+               else
+               {
+                       status = 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;
+
+       /* grab the samr open */
+       samr_io_q_query_groupinfo("", &q_e, data, 0);
+
+       /* construct reply. */
+       samr_reply_query_groupinfo(&q_e, rdata);
+}
+
 
 /*******************************************************************
  samr_reply_query_aliasinfo
@@ -550,8 +838,9 @@ 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.status = 0x0;
        r_e.ptr = 0;
 
        /* find the policy handle.  open a policy on it. */
@@ -562,17 +851,21 @@ static void samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
 
        DEBUG(5,("samr_reply_query_aliasinfo: %d\n", __LINE__));
 
-       if (r_e.status == 0x0)
+       if (status == 0x0)
        {
-               if (q_u->switch_level != 3)
+               if (q_u->switch_level == 3)
                {
-                       r_e.status = NT_STATUS_INVALID_INFO_CLASS;
+                       r_e.ptr = 1;
+                       ctr.switch_value = 3;
+                       make_samr_alias_info3(&ctr.alias.info3, "<account description>");
+               }
+               else
+               {
+                       status = NT_STATUS_INVALID_INFO_CLASS;
                }
        }
 
-       make_samr_r_query_aliasinfo(&r_e, q_u->switch_level,
-                           "<account description>",
-                               r_e.status);
+       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);
@@ -597,79 +890,225 @@ static void api_samr_query_aliasinfo( uint16 vuid, prs_struct *data, prs_struct
 
 
 /*******************************************************************
- samr_reply_lookup_ids
+ samr_reply_query_useraliases
  ********************************************************************/
-static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
+static void samr_reply_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
                                prs_struct *rdata)
 {
-       uint32 rid[MAX_SAM_ENTRIES];
-       uint32 status     = 0;
-       int num_rids = q_u->num_sids1;
+       uint32 status = 0;
 
-       SAMR_R_LOOKUP_IDS r_u;
+       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;
 
-       DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
+       SAMR_R_QUERY_USERALIASES r_u;
 
-       if (num_rids > MAX_SAM_ENTRIES)
+       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))
        {
-               num_rids = MAX_SAM_ENTRIES;
-               DEBUG(5,("samr_lookup_ids: truncating entries to %d\n", num_rids));
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
-
-#if 0
-       int i;
-       SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids);
-
-       for (i = 0; i < num_rids && status == 0; i++)
+       else
        {
-               struct sam_passwd *sam_pass;
-               fstring user_name;
+               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);
 
-               fstrcpy(user_name, unistrn2(q_u->uni_user_name[i].buffer,
-                                           q_u->uni_user_name[i].uni_str_len));
+       }
 
+       if (status == 0x0)
+       {
                /* find the user account */
                become_root(True);
-               sam_pass = get_smb21pwd_entry(user_name, 0);
+               sam_pass = getsam21pwrid(user_rid);
                unbecome_root(True);
 
                if (sam_pass == NULL)
                {
                        status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-                       rid[i] = 0;
+                       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
                {
-                       rid[i] = sam_pass->user_rid;
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
                }
        }
-#endif
 
-       num_rids = 1;
-       rid[0] = BUILTIN_ALIAS_RID_USERS;
+       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_lookup_ids(&r_u, num_rids, rid, status);
+       make_samr_r_query_useraliases(&r_u, num_rids, rid, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_lookup_ids("", &r_u, rdata, 0);
+       samr_io_r_query_useraliases("", &r_u, rdata, 0);
+
+       if (rid != NULL)
+       {
+               free(rid);
+       }
 
-       DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
+       DEBUG(5,("samr_query_useraliases: %d\n", __LINE__));
 
 }
 
 /*******************************************************************
- api_samr_lookup_ids
+ api_samr_query_useraliases
  ********************************************************************/
-static void api_samr_lookup_ids( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static void api_samr_query_useraliases( uint16 vuid, prs_struct *data, prs_struct *rdata)
 {
-       SAMR_Q_LOOKUP_IDS q_u;
+       SAMR_Q_QUERY_USERALIASES q_u;
 
        /* grab the samr 0x10 */
-       samr_io_q_lookup_ids("", &q_u, data, 0);
+       samr_io_q_query_useraliases("", &q_u, data, 0);
+
+       /* construct reply.  always indicate success */
+       samr_reply_query_useraliases(&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_GROUP;
+                       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_GROUP;
+                       unbecome_root(True);
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+               }
+       }
+
+       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;
+
+       /* grab the samr 0x21 */
+       samr_io_q_query_aliasmem("", &q_u, data, 0);
 
        /* construct reply.  always indicate success */
-       samr_reply_lookup_ids(&q_u, rdata);
+       samr_reply_query_aliasmem(&q_u, rdata);
 }
 
 /*******************************************************************
@@ -678,7 +1117,8 @@ static void api_samr_lookup_ids( uint16 vuid, prs_struct *data, prs_struct *rdat
 static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
                                prs_struct *rdata)
 {
-       uint32 rid[MAX_SAM_ENTRIES];
+       uint32 rid [MAX_SAM_ENTRIES];
+       uint8  type[MAX_SAM_ENTRIES];
        uint32 status     = 0;
        int i;
        int num_rids = q_u->num_rids1;
@@ -697,18 +1137,22 @@ static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
 
        for (i = 0; i < num_rids && status == 0; i++)
        {
+               DOM_SID sid;
                fstring name;
-
-               status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
-
                fstrcpy(name, unistrn2(q_u->uni_user_name[i].buffer, q_u->uni_user_name[i].uni_str_len));
 
-               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;
+               status = lookup_name(name, &sid, &(type[i]));
+               if (status == 0x0)
+               {
+                       sid_split_rid(&sid, &rid[i]);
+               }
+               else
+               {
+                       type[i] = SID_NAME_UNKNOWN;
+               }
        }
 
-       make_samr_r_lookup_names(&r_u, num_rids, rid, status);
+       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);
@@ -817,9 +1261,10 @@ static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
                                prs_struct *rdata)
 {
        fstring group_names[MAX_SAM_ENTRIES];
-       uint32  group_attrs[MAX_SAM_ENTRIES];
+       uint  group_attrs[MAX_SAM_ENTRIES];
        uint32 status     = 0;
        int num_gids = q_u->num_gids1;
+       DOM_SID pol_sid;
 
        SAMR_R_UNKNOWN_12 r_u;
 
@@ -831,6 +1276,11 @@ static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
                status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
+       if (status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &pol_sid))
+       {
+               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
        if (status == 0x0)
        {
                int i;
@@ -842,7 +1292,10 @@ static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
 
                for (i = 0; i < num_gids && status == 0; i++)
                {
-                       fstrcpy(group_names[i], "dummy group");
+                       DOM_SID sid;
+                       sid_copy(&sid, &pol_sid);
+                       sid_append_rid(&sid, q_u->gid[i]);
+                       lookup_sid(&sid, group_names[i], &group_attrs[i]);
                        group_attrs[i] = 0x2;
                }
        }
@@ -946,21 +1399,38 @@ static void api_samr_open_user( uint16 vuid, prs_struct *data, prs_struct *rdata
 
 
 /*************************************************************************
- get_user_info_21
+ get_user_info_10
  *************************************************************************/
-static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
+static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
 {
-       NTTIME dummy_time;
        struct sam_passwd *sam_pass;
-       LOGON_HRS hrs;
-       int i;
 
-       if (!pdb_rid_is_user(user_rid))
+       become_root(True);
+       sam_pass = getsam21pwrid(user_rid);
+       unbecome_root(True);
+
+       if (sam_pass == NULL)
        {
-               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+               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);
@@ -971,12 +1441,7 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
                return False;
        }
 
-       DEBUG(3,("User:[%s]\n", sam_pass->smb_name));
-
-       dummy_time.low  = 0xffffffff;
-       dummy_time.high = 0x7fffffff;
-
-       DEBUG(0,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
+       DEBUG(3,("User:[%s]\n", sam_pass->nt_name));
 
        /* create a LOGON_HRS structure */
        hrs.len = sam_pass->hours_len;
@@ -988,14 +1453,14 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
 
        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->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->smb_name, /* user_name */
+                          sam_pass->nt_name, /* user_name */
                           sam_pass->full_name, /* full_name */
                           sam_pass->home_dir, /* home_dir */
                           sam_pass->dir_drive, /* dir_drive */
@@ -1008,13 +1473,13 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
 
                           sam_pass->user_rid, /* RID user_id */
                           sam_pass->group_rid, /* RID group_id */
-                      sam_pass->acct_ctrl,
+                          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);
+                          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;
 }
@@ -1029,6 +1494,7 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
 #if 0
        SAM_USER_INFO_11 id11;
 #endif
+       SAM_USER_INFO_10 id10;
        SAM_USER_INFO_21 id21;
        void *info = NULL;
 
@@ -1056,6 +1522,12 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
        {
                switch (q_u->switch_value)
                {
+                       case 0x10:
+                       {
+                               info = (void*)&id10;
+                               status = get_user_info_10(&id10, rid) ? 0 : NT_STATUS_NO_SUCH_USER;
+                               break;
+                       }
 #if 0
 /* whoops - got this wrong.  i think.  or don't understand what's happening. */
                        case 0x11:
@@ -1153,10 +1625,19 @@ static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
 
        if (status == 0x0)
        {
-               pstring groups;
-               get_domain_user_groups(groups, sam_pass->smb_name);
+               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(groups, &gids);
+               num_groups = make_dom_gids(mem_grp, num_groups, &gids);
+
+               if (mem_grp != NULL)
+               {
+                       free(mem_grp);
+               }
        }
 
        /* construct the response.  lkclXXXX: gids are not copied! */
@@ -1188,6 +1669,75 @@ static void api_samr_query_usergroups( uint16 vuid, prs_struct *data, prs_struct
 }
 
 
+/*******************************************************************
+ samr_reply_query_dom_info
+ ********************************************************************/
+static void samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_QUERY_DOMAIN_INFO r_u;
+       SAM_UNK_CTR ctr;
+       uint16 switch_value = 0x0;
+       uint32 status = 0x0;
+
+       ZERO_STRUCT(r_u);
+       ZERO_STRUCT(ctr);
+
+       r_u.ctr = &ctr;
+
+       DEBUG(5,("samr_reply_query_dom_info: %d\n", __LINE__));
+
+       /* 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;
+               DEBUG(5,("samr_reply_query_dom_info: invalid handle\n"));
+       }
+
+       if (status == 0x0)
+       {
+               switch (q_u->switch_value)
+               {
+                       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;
+                       }
+               }
+       }
+
+       make_samr_r_query_dom_info(&r_u, switch_value, &ctr, status);
+
+       /* store the response in the SMB stream */
+       samr_io_r_query_dom_info("", &r_u, rdata, 0);
+
+       DEBUG(5,("samr_query_dom_info: %d\n", __LINE__));
+
+}
+
+/*******************************************************************
+ api_samr_query_dom_info
+ ********************************************************************/
+static void api_samr_query_dom_info( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+       SAMR_Q_QUERY_DOMAIN_INFO q_e;
+
+       /* grab the samr unknown 8 command */
+       samr_io_q_query_dom_info("", &q_e, data, 0);
+
+       /* construct reply. */
+       samr_reply_query_dom_info(&q_e, rdata);
+}
+
+
+
 /*******************************************************************
  samr_reply_unknown_32
  ********************************************************************/
@@ -1244,7 +1794,7 @@ static void api_samr_unknown_32( uint16 vuid, prs_struct *data, prs_struct *rdat
                                    q_u.uni_mach_acct.uni_str_len));
 
        become_root(True);
-       sam_pass = getsam21pwnam(mach_acct);
+       sam_pass = getsam21pwntnam(mach_acct);
        unbecome_root(True);
 
        if (sam_pass != NULL)
@@ -1377,17 +1927,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))
        {
@@ -1395,6 +1953,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));
@@ -1424,6 +1991,77 @@ static void api_samr_open_alias( uint16 vuid, prs_struct *data, prs_struct *rdat
        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;
+       BOOL pol_open = False;
+
+       /* set up the SAMR open_group response */
+
+       r_u.status = 0x0;
+       if (r_u.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->domain_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 group 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_group))
+       {
+               /* oh, whoops.  don't know what error message to return, here */
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       sid_append_rid(&sid, q_u->rid_group);
+
+       /* associate an group 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));
+       }
+
+       DEBUG(5,("samr_open_group: %d\n", __LINE__));
+
+       /* 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;
+
+       /* grab the samr open policy */
+       samr_io_q_open_group("", &q_u, data, 0);
+
+       /* construct reply.  always indicate success */
+       samr_reply_open_group(&q_u, rdata);
+}
+
 /*******************************************************************
  array of \PIPE\samr operations
  ********************************************************************/
@@ -1435,20 +2073,25 @@ static struct api_struct api_samr_cmds [] =
        { "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_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_QUERY_GROUPINFO"  , SAMR_QUERY_GROUPINFO  , api_samr_query_groupinfo  },
        { "SAMR_0x32"             , 0x32                  , api_samr_unknown_32       },
        { "SAMR_UNKNOWN_12"       , SAMR_UNKNOWN_12       , api_samr_unknown_12       },
        { "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        },
+       { "SAMR_UNKNOWN_2C"       , SAMR_UNKNOWN_2C       , api_samr_unknown_2c       },
        { NULL                    , 0                     , NULL                      }
 };