extern int DEBUGLEVEL;
-extern fstring global_sam_name;
+extern fstring global_myworkgroup;
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[];
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);
+ user_name_len = strlen(pwd->smb_name);
+ init_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, user_name_len);
+ init_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len);
pw_buf[(*num_entries)].user_rid = pwd->user_rid;
- bzero( pw_buf[(*num_entries)].nt_pwd , 16);
+ memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
/* Now check if the NT compatible password is available. */
if (pwd->smb_nt_passwd != NULL)
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->nt_name,
+ (*num_entries), pwd->smb_name,
pwd->user_rid, pwd->acct_ctrl));
if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask))
SAMR_R_CLOSE_HND r_u;
/* set up the SAMR unknown_1 response */
- bzero(r_u.pol.data, POL_HND_SIZE);
+ memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
/* close the policy handle */
if (close_lsa_policy_hnd(&(q_u->pol)))
/*******************************************************************
api_samr_close_hnd
********************************************************************/
-static void api_samr_close_hnd( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_close_hnd( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_CLOSE_HND q_u;
/* construct reply. always indicate success */
samr_reply_close_hnd(&q_u, rdata);
+
+ return True;
}
/*******************************************************************
api_samr_open_domain
********************************************************************/
-static void api_samr_open_domain( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_domain( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_OPEN_DOMAIN q_u;
/* construct reply. always indicate success */
samr_reply_open_domain(&q_u, rdata);
+
+ return True;
}
status = NT_STATUS_OBJECT_TYPE_MISMATCH;
}
- make_samr_r_unknown_2c(&r_u, status);
+ init_samr_r_unknown_2c(&r_u, status);
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)
+static BOOL api_samr_unknown_2c( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_UNKNOWN_2C q_u;
/* construct reply. always indicate success */
samr_reply_unknown_2c(&q_u, rdata);
+
+ return True;
}
if (status == 0x0)
{
- DOM_SID usr_sid;
+ DOM_SID user_sid;
+ DOM_SID everyone_sid;
- usr_sid = global_sam_sid;
+ user_sid = global_sam_sid;
- SMB_ASSERT_ARRAY(usr_sid.sub_auths, usr_sid.num_auths+1);
+ SMB_ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1);
/*
* Add the user RID.
*/
- sid_append_rid(&usr_sid, rid);
+ user_sid.sub_auths[user_sid.num_auths++] = 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, &global_sid_S_1_1);
- make_dom_sid3(&(sid[1]), 0x0044, 0x0002, &usr_sid);
+ string_to_sid(&everyone_sid, "S-1-1");
+
+ /* 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 */
+ init_dom_sid3(&(sid[0]), 0x035b, 0x0002, &everyone_sid);
+ init_dom_sid3(&(sid[1]), 0x0044, 0x0002, &user_sid);
}
- make_samr_r_unknown_3(&r_u,
+ init_samr_r_unknown_3(&r_u,
0x0001, 0x8004,
0x00000014, 0x0002, 0x0070,
2, sid, status);
/*******************************************************************
api_samr_unknown_3
********************************************************************/
-static void api_samr_unknown_3( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_3( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_UNKNOWN_3 q_u;
/* construct reply. always indicate success */
samr_reply_unknown_3(&q_u, rdata);
+
+ return True;
}
get_sampwd_entries(pass, 0, &total_entries, &num_entries, MAX_SAM_ENTRIES, q_u->acb_mask);
unbecome_root(True);
- make_samr_r_enum_dom_users(&r_e, total_entries,
+ init_samr_r_enum_dom_users(&r_e, total_entries,
q_u->unknown_0, num_entries,
pass, r_e.status);
/*******************************************************************
api_samr_enum_dom_users
********************************************************************/
-static void api_samr_enum_dom_users( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_users( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_ENUM_DOM_USERS q_e;
/* construct reply. */
samr_reply_enum_dom_users(&q_e, rdata);
+
+ return True;
}
prs_struct *rdata)
{
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;
+ SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
+ int num_entries;
+ BOOL got_grps;
+ char *dummy_group = "Domain Admins";
r_e.status = 0x0;
r_e.num_entries = 0;
/* find the policy handle. open a policy on it. */
- if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
+ if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
{
r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
}
- sid_to_string(sid_str, &sid);
-
- DEBUG(5,("samr_reply_enum_dom_groups: sid %s\n", sid_str));
+ DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
- 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;
- }
-
- i++;
- }
- }
+ got_grps = True;
+ num_entries = 1;
+ init_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group));
+ pass[0].user_rid = DOMAIN_GROUP_RID_ADMINS;
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);
+ init_samr_r_enum_dom_groups(&r_e, q_u->start_idx, num_entries, pass, r_e.status);
}
/* store the response in the SMB stream */
samr_io_r_enum_dom_groups("", &r_e, rdata, 0);
- if (grps != NULL)
- {
- free(grps);
- }
-
DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
+
}
/*******************************************************************
api_samr_enum_dom_groups
********************************************************************/
-static void api_samr_enum_dom_groups( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_groups( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_ENUM_DOM_GROUPS q_e;
/* construct reply. */
samr_reply_enum_dom_groups(&q_e, rdata);
+
+ return True;
}
prs_struct *rdata)
{
SAMR_R_ENUM_DOM_ALIASES r_e;
- LOCAL_GRP *alss = NULL;
+ SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
int num_entries = 0;
DOM_SID sid;
fstring sid_str;
+ fstring sam_sid_str;
r_e.status = 0x0;
r_e.num_entries = 0;
}
sid_to_string(sid_str, &sid);
+ sid_to_string(sam_sid_str, &global_sam_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))
+ if (strequal(sid_str, "S-1-5-32"))
{
char *name;
-
- while ((name = builtin_alias_rids[num_entries].name) != NULL)
+ while (num_entries < MAX_SAM_ENTRIES && ((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;
-
- if (!add_domain_alias(&alss, &num_entries, &tmp_als))
- {
- r_e.status = 0xC0000000 | NT_STATUS_NO_MEMORY;
- break;
- }
+ init_unistr2(&(pass[num_entries].uni_user_name), name, strlen(name));
+ pass[num_entries].user_rid = builtin_alias_rids[num_entries].rid;
+ num_entries++;
}
}
- else if (sid_equal(&sid, &global_sam_sid))
+ else if (strequal(sid_str, sam_sid_str))
{
- BOOL ret;
/* local aliases */
+ /* oops! there's no code to deal with this */
+ DEBUG(3,("samr_reply_enum_dom_aliases: enum of aliases in our domain not supported yet\n"));
num_entries = 0;
-
- 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);
- }
+ init_samr_r_enum_dom_aliases(&r_e, num_entries, pass, 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)
+static BOOL api_samr_enum_dom_aliases( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_ENUM_DOM_ALIASES q_e;
/* construct reply. */
samr_reply_enum_dom_aliases(&q_e, rdata);
+
+ return True;
}
/* query disp info is for users */
switch_level = 0x1;
- make_sam_info_1(&info1, ACB_NORMAL,
+ init_sam_info_1(&info1, ACB_NORMAL,
q_u->start_idx, num_entries, pass);
ctr.sam.info1 = &info1;
{
/* query disp info is for servers */
switch_level = 0x2;
- make_sam_info_2(&info2, ACB_WSTRUST,
+ init_sam_info_2(&info2, ACB_WSTRUST,
q_u->start_idx, num_entries, pass);
ctr.sam.info2 = &info2;
if (r_e.status == 0 && got_pwds)
{
- make_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
+ init_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
}
/* store the response in the SMB stream */
/*******************************************************************
api_samr_query_dispinfo
********************************************************************/
-static void api_samr_query_dispinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_dispinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_QUERY_DISPINFO q_e;
/* construct reply. */
samr_reply_query_dispinfo(&q_e, rdata);
+
+ return True;
}
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. */
DEBUG(5,("samr_reply_query_aliasinfo: %d\n", __LINE__));
- if (status == 0x0)
+ if (r_e.status == 0x0)
{
- if (q_u->switch_level == 3)
+ if (q_u->switch_level != 3)
{
- r_e.ptr = 1;
- ctr.switch_value = 3;
- make_samr_alias_info3(&ctr.alias.info3, "<account description>");
- }
- else
- {
- status = NT_STATUS_INVALID_INFO_CLASS;
+ r_e.status = NT_STATUS_INVALID_INFO_CLASS;
}
}
- make_samr_r_query_aliasinfo(&r_e, status == 0 ? &ctr : NULL, status);
+ init_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);
/*******************************************************************
api_samr_query_aliasinfo
********************************************************************/
-static void api_samr_query_aliasinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_aliasinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_QUERY_ALIASINFO q_e;
/* construct reply. */
samr_reply_query_aliasinfo(&q_e, rdata);
+
+ return True;
}
/*******************************************************************
- samr_reply_query_useraliases
+ samr_reply_lookup_ids
********************************************************************/
-static void samr_reply_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
+static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *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;
+ uint32 rid[MAX_SAM_ENTRIES];
+ uint32 status = 0;
+ int num_rids = q_u->num_sids1;
- SAMR_R_QUERY_USERALIASES r_u;
+ SAMR_R_LOOKUP_IDS r_u;
- DEBUG(5,("samr_query_useraliases: %d\n", __LINE__));
+ DEBUG(5,("samr_lookup_ids: %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
+ if (num_rids > MAX_SAM_ENTRIES)
{
- sid_to_string(dom_sid_str, &dom_sid );
- sid_to_string(sam_sid_str, &global_sam_sid);
+ num_rids = MAX_SAM_ENTRIES;
+ DEBUG(5,("samr_lookup_ids: truncating entries to %d\n", num_rids));
}
- if (status == 0x0)
+#if 0
+ int i;
+ SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids);
+
+ for (i = 0; i < num_rids && status == 0; i++)
{
- usr_sid = q_u->sid[0].sid;
- sid_split_rid(&usr_sid, &user_rid);
- sid_to_string(usr_sid_str, &usr_sid);
+ struct sam_passwd *sam_pass;
+ fstring user_name;
- }
- if (status == 0x0)
- {
+ fstrcpy(user_name, unistrn2(q_u->uni_user_name[i].buffer,
+ q_u->uni_user_name[i].uni_str_len));
+
/* find the user account */
become_root(True);
- sam_pass = getsam21pwrid(user_rid);
+ sam_pass = get_smb21pwd_entry(user_name, 0);
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);
+ rid[i] = 0;
}
else
{
- status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+ rid[i] = sam_pass->user_rid;
}
}
+#endif
- 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);
- }
- }
+ num_rids = 1;
+ rid[0] = BUILTIN_ALIAS_RID_USERS;
- make_samr_r_query_useraliases(&r_u, num_rids, rid, status);
+ init_samr_r_lookup_ids(&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);
- }
+ samr_io_r_lookup_ids("", &r_u, rdata, 0);
- DEBUG(5,("samr_query_useraliases: %d\n", __LINE__));
+ DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
}
/*******************************************************************
- api_samr_query_useraliases
+ api_samr_lookup_ids
********************************************************************/
-static void api_samr_query_useraliases( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_lookup_ids( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
- SAMR_Q_QUERY_USERALIASES q_u;
+ SAMR_Q_LOOKUP_IDS q_u;
/* grab the samr 0x10 */
- samr_io_q_query_useraliases("", &q_u, data, 0);
+ samr_io_q_lookup_ids("", &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_SID *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) ? 0xC0000000 | NT_STATUS_NO_SUCH_GROUP : 0x0;
- unbecome_root(True);
- }
- else if (sid_equal(&alias_sid, &global_sam_sid))
- {
- DEBUG(10,("lookup on Domain SID\n"));
+ samr_reply_lookup_ids(&q_u, rdata);
- become_root(True);
- status = getaliasrid(alias_rid, &mem_grp, &num_sids) ? 0xC0000000 | NT_STATUS_NO_SUCH_GROUP : 0x0;
- 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++)
- {
- 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_query_aliasmem(&q_u, rdata);
+ return True;
}
/*******************************************************************
samr_reply_lookup_names
********************************************************************/
-static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
+
+static BOOL 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;
+ uint32 status = 0;
int i;
- int num_rids = q_u->num_rids1;
+ 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 (num_rids > MAX_SAM_ENTRIES)
- {
+ ZERO_ARRAY(rid);
+ ZERO_ARRAY(type);
+
+ if (!get_lsa_policy_samr_sid(&q_u->pol, &pol_sid)) {
+ status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+ init_samr_r_lookup_names(&r_u, 0, rid, type, status);
+ if(!samr_io_r_lookup_names("", &r_u, rdata, 0)) {
+ DEBUG(0,("samr_reply_lookup_names: failed to marshall SAMR_R_LOOKUP_NAMES.\n"));
+ return False;
+ }
+ return True;
+ }
+
+ 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_user_name, num_rids);
+ SMB_ASSERT_ARRAY(q_u->uni_name, num_rids);
- for (i = 0; i < num_rids && status == 0; i++)
- {
- DOM_SID sid;
+ for (i = 0; i < num_rids; i++) {
fstring name;
- fstrcpy(name, unistrn2(q_u->uni_user_name[i].buffer, q_u->uni_user_name[i].uni_str_len));
- status = lookup_name(name, &sid, &(type[i]));
- if (status == 0x0)
- {
- sid_split_rid(&sid, &rid[i]);
- }
- else
- {
- type[i] = SID_NAME_UNKNOWN;
+ status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+
+ rid [i] = 0xffffffff;
+ type[i] = SID_NAME_UNKNOWN;
+
+ fstrcpy(name, dos_unistrn2(q_u->uni_name[i].buffer,
+ q_u->uni_name[i].uni_str_len));
+
+ if(sid_equal(&pol_sid, &global_sam_sid)) {
+ DOM_SID sid;
+
+ if(lookup_local_name(global_myname, name, &sid, &type[i])) {
+ sid_split_rid( &sid, &rid[i]);
+ status = 0;
+ }
}
}
- make_samr_r_lookup_names(&r_u, num_rids, rid, type, status);
+ init_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);
+ if(!samr_io_r_lookup_names("", &r_u, rdata, 0)) {
+ DEBUG(0,("samr_reply_lookup_names: failed to marshall SAMR_R_LOOKUP_NAMES.\n"));
+ return False;
+ }
DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+ return True;
}
/*******************************************************************
api_samr_lookup_names
********************************************************************/
-static void api_samr_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rdata)
+
+static BOOL api_samr_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_LOOKUP_NAMES q_u;
+ memset(&q_u, '\0', sizeof(q_u));
+
/* grab the samr lookup names */
- samr_io_q_lookup_names("", &q_u, data, 0);
+ if(!samr_io_q_lookup_names("", &q_u, data, 0)) {
+ DEBUG(0,("api_samr_lookup_names: failed to unmarshall SAMR_Q_LOOKUP_NAMES.\n"));
+ return False;
+ }
/* construct reply. always indicate success */
- samr_reply_lookup_names(&q_u, rdata);
+ if(!samr_reply_lookup_names(&q_u, rdata))
+ return False;
+
+ return True;
}
/*******************************************************************
samr_reply_chgpasswd_user
********************************************************************/
-static void samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
+
+static BOOL samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
prs_struct *rdata)
{
SAMR_R_CHGPASSWD_USER r_u;
fstring user_name;
fstring wks;
- fstrcpy(user_name, unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len));
- fstrcpy(wks , unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len));
+ fstrcpy(user_name, dos_unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len));
+ fstrcpy(wks , dos_unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len));
DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
status = 0xC0000000 | NT_STATUS_WRONG_PASSWORD;
}
- make_samr_r_chgpasswd_user(&r_u, status);
+ init_samr_r_chgpasswd_user(&r_u, status);
/* store the response in the SMB stream */
- samr_io_r_chgpasswd_user("", &r_u, rdata, 0);
+ if(!samr_io_r_chgpasswd_user("", &r_u, rdata, 0)) {
+ DEBUG(0,("samr_reply_chgpasswd_user: Failed to marshall SAMR_R_CHGPASSWD_USER struct.\n" ));
+ return False;
+ }
DEBUG(5,("samr_chgpasswd_user: %d\n", __LINE__));
+ return True;
}
/*******************************************************************
api_samr_chgpasswd_user
********************************************************************/
-static void api_samr_chgpasswd_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
+
+static BOOL api_samr_chgpasswd_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_CHGPASSWD_USER q_u;
/* unknown 38 command */
- samr_io_q_chgpasswd_user("", &q_u, data, 0);
+ if (!samr_io_q_chgpasswd_user("", &q_u, data, 0)) {
+ DEBUG(0,("api_samr_chgpasswd_user: samr_io_q_chgpasswd_user failed to parse RPC packet.\n"));
+ return False;
+ }
/* construct reply. */
- samr_reply_chgpasswd_user(&q_u, rdata);
+ if(!samr_reply_chgpasswd_user(&q_u, rdata)) {
+ DEBUG(0,("api_samr_chgpasswd_user: samr_reply_chgpasswd_user failed to create reply packet.\n"));
+ return False;
+ }
+
+ return True;
}
DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
- make_samr_r_unknown_38(&r_u);
+ init_samr_r_unknown_38(&r_u);
/* store the response in the SMB stream */
samr_io_r_unknown_38("", &r_u, rdata, 0);
/*******************************************************************
api_samr_unknown_38
********************************************************************/
-static void api_samr_unknown_38( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_38( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_UNKNOWN_38 q_u;
/* construct reply. always indicate success */
samr_reply_unknown_38(&q_u, rdata);
+
+ return True;
}
prs_struct *rdata)
{
fstring group_names[MAX_SAM_ENTRIES];
- uint8 group_attrs[MAX_SAM_ENTRIES];
+ uint32 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;
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;
for (i = 0; i < num_gids && status == 0; i++)
{
- 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]);
+ fstrcpy(group_names[i], "dummy group");
group_attrs[i] = 0x2;
}
}
- make_samr_r_unknown_12(&r_u, num_gids, group_names, group_attrs, status);
+ init_samr_r_unknown_12(&r_u, num_gids, group_names, group_attrs, status);
/* store the response in the SMB stream */
samr_io_r_unknown_12("", &r_u, rdata, 0);
/*******************************************************************
api_samr_unknown_12
********************************************************************/
-static void api_samr_unknown_12( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_12( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_UNKNOWN_12 q_u;
/* construct reply. always indicate success */
samr_reply_unknown_12(&q_u, rdata);
+
+ return True;
}
BOOL pol_open = False;
/* set up the SAMR open_user response */
- bzero(r_u.user_pol.data, POL_HND_SIZE);
+ memset((char *)r_u.user_pol.data, '\0', POL_HND_SIZE);
r_u.status = 0x0;
/*******************************************************************
api_samr_open_user
********************************************************************/
-static void api_samr_open_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_OPEN_USER q_u;
/* construct reply. always indicate success */
samr_reply_open_user(&q_u, rdata, 0x0);
+
+ return True;
}
*************************************************************************/
static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
{
- struct sam_passwd *sam_pass;
+ struct smb_passwd *smb_pass;
+
+ if (!pdb_rid_is_user(user_rid))
+ {
+ DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+ return False;
+ }
become_root(True);
- sam_pass = getsam21pwrid(user_rid);
+ smb_pass = getsmbpwrid(user_rid);
unbecome_root(True);
- if (sam_pass == NULL)
+ if (smb_pass == NULL)
{
DEBUG(4,("User 0x%x not found\n", user_rid));
return False;
}
- DEBUG(3,("User:[%s]\n", sam_pass->nt_name));
+ DEBUG(3,("User:[%s]\n", smb_pass->smb_name));
- make_sam_user_info10(id10, sam_pass->acct_ctrl);
+ init_sam_user_info10(id10, smb_pass->acct_ctrl);
return True;
}
*************************************************************************/
static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
{
+ NTTIME dummy_time;
struct sam_passwd *sam_pass;
LOGON_HRS hrs;
int i;
+ if (!pdb_rid_is_user(user_rid))
+ {
+ DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+ return False;
+ }
+
become_root(True);
sam_pass = getsam21pwrid(user_rid);
unbecome_root(True);
return False;
}
- DEBUG(3,("User:[%s]\n", sam_pass->nt_name));
+ DEBUG(3,("User:[%s]\n", sam_pass->smb_name));
+
+ dummy_time.low = 0xffffffff;
+ dummy_time.high = 0x7fffffff;
+
+ DEBUG(5,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
/* create a LOGON_HRS structure */
hrs.len = sam_pass->hours_len;
hrs.hours[i] = sam_pass->hours[i];
}
- make_sam_user_info21(id21,
+ init_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,
+ &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->nt_name, /* user_name */
+ 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->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;
}
}
}
- make_samr_r_query_userinfo(&r_u, q_u->switch_value, info, status);
+ init_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);
/*******************************************************************
api_samr_query_userinfo
********************************************************************/
-static void api_samr_query_userinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_userinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_QUERY_USERINFO q_u;
/* construct reply. always indicate success */
samr_reply_query_userinfo(&q_u, rdata);
+
+ return True;
}
if (status == 0x0)
{
- DOMAIN_GRP *mem_grp = NULL;
-
- become_root(True);
- getusergroupsntnam(sam_pass->nt_name, &mem_grp, &num_groups);
- unbecome_root(True);
-
+ pstring groups;
+ get_domain_user_groups(groups, sam_pass->smb_name);
gids = NULL;
- num_groups = make_dom_gids(mem_grp, num_groups, &gids);
-
- if (mem_grp != NULL)
- {
- free(mem_grp);
- }
+ num_groups = make_dom_gids(groups, &gids);
}
/* construct the response. lkclXXXX: gids are not copied! */
- make_samr_r_query_usergroups(&r_u, num_groups, gids, status);
+ init_samr_r_query_usergroups(&r_u, num_groups, gids, status);
/* store the response in the SMB stream */
samr_io_r_query_usergroups("", &r_u, rdata, 0);
/*******************************************************************
api_samr_query_usergroups
********************************************************************/
-static void api_samr_query_usergroups( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_usergroups( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_QUERY_USERGROUPS q_u;
/* grab the samr unknown 32 */
/* construct reply. */
samr_reply_query_usergroups(&q_u, rdata);
+
+ return True;
}
case 0x02:
{
switch_value = 0x2;
- make_unk_info2(&ctr.info.inf2, global_sam_name, global_myname);
+ init_unk_info2(&ctr.info.inf2, global_myworkgroup, global_myname);
break;
}
}
}
- make_samr_r_query_dom_info(&r_u, switch_value, &ctr, status);
+ init_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);
/*******************************************************************
api_samr_query_dom_info
********************************************************************/
-static void api_samr_query_dom_info( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_dom_info( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_QUERY_DOMAIN_INFO q_e;
/* construct reply. */
samr_reply_query_dom_info(&q_e, rdata);
+
+ return True;
}
SAMR_R_UNKNOWN_32 r_u;
/* set up the SAMR unknown_32 response */
- bzero(r_u.pol.data, POL_HND_SIZE);
+ memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
if (status == 0)
{
for (i = 4; i < POL_HND_SIZE; i++)
}
}
- make_dom_rid4(&(r_u.rid4), 0x0030, 0, 0);
+ init_dom_rid4(&(r_u.rid4), 0x0030, 0, 0);
r_u.status = status;
DEBUG(5,("samr_unknown_32: %d\n", __LINE__));
/*******************************************************************
api_samr_unknown_32
********************************************************************/
-static void api_samr_unknown_32( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_32( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
uint32 status = 0;
struct sam_passwd *sam_pass;
reply if the account already exists...
*/
- fstrcpy(mach_acct, unistrn2(q_u.uni_mach_acct.buffer,
+ fstrcpy(mach_acct, dos_unistrn2(q_u.uni_mach_acct.buffer,
q_u.uni_mach_acct.uni_str_len));
become_root(True);
- sam_pass = getsam21pwntnam(mach_acct);
+ sam_pass = getsam21pwnam(mach_acct);
unbecome_root(True);
if (sam_pass != NULL)
/* construct reply. */
samr_reply_unknown_32(&q_u, rdata, status);
+
+ return True;
}
/*******************************************************************
api_samr_connect_anon
********************************************************************/
-static void api_samr_connect_anon( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_connect_anon( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_CONNECT_ANON q_u;
/* construct reply. always indicate success */
samr_reply_connect_anon(&q_u, rdata);
+
+ return True;
}
/*******************************************************************
/*******************************************************************
api_samr_connect
********************************************************************/
-static void api_samr_connect( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_connect( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_CONNECT q_u;
/* construct reply. always indicate success */
samr_reply_connect(&q_u, rdata);
+
+ return True;
}
/*******************************************************************
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 = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
- sid_copy(&sid, &global_sid_S_1_5_20);
- 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));
/*******************************************************************
api_samr_open_alias
********************************************************************/
-static void api_samr_open_alias( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_alias( uint16 vuid, prs_struct *data, prs_struct *rdata)
{
SAMR_Q_OPEN_ALIAS q_u;
/* construct reply. always indicate success */
samr_reply_open_alias(&q_u, rdata);
+
+ return True;
}
/*******************************************************************
{ "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_QUERY_USERALIASES", SAMR_QUERY_USERALIASES, api_samr_query_useraliases},
- { "SAMR_QUERY_ALIASMEM" , SAMR_QUERY_ALIASMEM , api_samr_query_aliasmem },
+ { "SAMR_LOOKUP_IDS" , SAMR_LOOKUP_IDS , api_samr_lookup_ids },
{ "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_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 },
{
return api_rpcTNP(p, "api_samr_rpc", api_samr_cmds, data);
}
-
git.samba.org / gd / samba-autobuild / .git / blobdiff