reads or writes a structure.
********************************************************************/
void make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
- POLICY_HND *connect_pol, uint32 rid, char *sid)
+ POLICY_HND *connect_pol, uint32 rid,
+ DOM_SID *sid)
{
if (q_u == NULL) return;
make_dom_sid2(&(q_u->dom_sid), sid);
}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
prs_uint32("status", ps, depth, &(r_u->status));
}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void make_samr_q_unknown_8(SAMR_Q_UNKNOWN_8 *q_u,
- POLICY_HND *domain_pol, uint16 switch_value)
+void make_samr_q_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
+ POLICY_HND *user_pol, uint16 switch_value)
{
if (q_u == NULL) return;
- DEBUG(5,("samr_make_q_unknown_8\n"));
+ DEBUG(5,("samr_make_q_unknown_3\n"));
- memcpy(&q_u->domain_pol, domain_pol, sizeof(q_u->domain_pol));
+ memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
q_u->switch_value = switch_value;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void samr_io_q_unknown_8(char *desc, SAMR_Q_UNKNOWN_8 *q_u, prs_struct *ps, int depth)
+void samr_io_q_unknown_3(char *desc, SAMR_Q_UNKNOWN_3 *q_u, prs_struct *ps, int depth)
{
if (q_u == NULL) return;
- prs_debug(ps, depth, desc, "samr_io_q_unknown_8");
+ prs_debug(ps, depth, desc, "samr_io_q_unknown_3");
depth++;
prs_align(ps);
- smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
+ smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth);
prs_align(ps);
prs_uint16("switch_value", ps, depth, &(q_u->switch_value));
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void make_samr_q_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
- POLICY_HND *user_pol, uint16 switch_value)
+void make_samr_q_unknown_8(SAMR_Q_UNKNOWN_8 *q_u,
+ POLICY_HND *domain_pol, uint16 switch_value)
{
if (q_u == NULL) return;
- DEBUG(5,("samr_make_q_unknown_3\n"));
+ DEBUG(5,("samr_make_q_unknown_8\n"));
- memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
+ memcpy(&q_u->domain_pol, domain_pol, sizeof(q_u->domain_pol));
q_u->switch_value = switch_value;
}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void samr_io_q_unknown_3(char *desc, SAMR_Q_UNKNOWN_3 *q_u, prs_struct *ps, int depth)
+void samr_io_q_unknown_8(char *desc, SAMR_Q_UNKNOWN_8 *q_u, prs_struct *ps, int depth)
{
if (q_u == NULL) return;
- prs_debug(ps, depth, desc, "samr_io_q_unknown_3");
+ prs_debug(ps, depth, desc, "samr_io_q_unknown_8");
depth++;
prs_align(ps);
- smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth);
+ smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
prs_align(ps);
prs_uint16("switch_value", ps, depth, &(q_u->switch_value));
prs_align(ps);
}
-
/*******************************************************************
makes a DOM_SID3 structure.
calculate length by adding up the size of the components.
********************************************************************/
-void make_dom_sid3(DOM_SID3 *sid3, uint16 unk_0, uint16 unk_1, char *sid)
+void make_dom_sid3(DOM_SID3 *sid3, uint16 unk_0, uint16 unk_1, DOM_SID *sid)
{
if (sid3 == NULL) return;
- make_dom_sid(&(sid3->sid), sid);
+ sid3->sid = *sid;
sid3->len = 2 + 8 + sid3->sid.num_auths * 4;
}
the length _includes_ the length of the length, too :-)
********************************************************************/
-void sam_io_dom_sid3(char *desc, DOM_SID3 *sid3, prs_struct *ps, int depth)
+static void sam_io_dom_sid3(char *desc, DOM_SID3 *sid3, prs_struct *ps, int depth)
{
if (sid3 == NULL) return;
unknown_7 : 0x5800 or 0x0070
********************************************************************/
-void make_sam_sid_stuff(SAM_SID_STUFF *stf,
+static void make_sam_sid_stuff(SAM_SID_STUFF *stf,
uint16 unknown_2, uint16 unknown_3,
uint32 unknown_4, uint16 unknown_6, uint16 unknown_7,
int num_sid3s, DOM_SID3 sid3[MAX_SAM_SIDS])
/*******************************************************************
reads or writes a SAM_SID_STUFF structure.
********************************************************************/
-void sam_io_sid_stuff(char *desc, SAM_SID_STUFF *stf, prs_struct *ps, int depth)
+static void sam_io_sid_stuff(char *desc, SAM_SID_STUFF *stf, prs_struct *ps, int depth)
{
int i;
prs_uint32("num_sids ", ps, depth, &(stf->num_sids ));
prs_uint16("padding2 ", ps, depth, &(stf->padding2 ));
+ SMB_ASSERT_ARRAY(stf->sid, stf->num_sids);
+
for (i = 0; i < stf->num_sids; i++)
{
sam_io_dom_sid3("", &(stf->sid[i]), ps, depth);
prs_uint32("status", ps, depth, &(r_u->status));
}
-
-/*******************************************************************
-makes a SAM_STR1 structure.
-********************************************************************/
-void make_sam_str1(SAM_STR1 *sam, char *sam_acct, char *sam_name, char *sam_desc)
-{
- int len_sam_acct = sam_acct != NULL ? strlen(sam_acct) : 0;
- int len_sam_name = sam_name != NULL ? strlen(sam_name) : 0;
- int len_sam_desc = sam_desc != NULL ? strlen(sam_desc) : 0;
-
- if (sam == NULL) return;
-
- DEBUG(5,("make_sam_str1: %d\n", __LINE__));
-
- make_unistr2(&(sam->uni_acct_name), sam_acct, len_sam_acct);
- make_unistr2(&(sam->uni_full_name), sam_name, len_sam_name);
- make_unistr2(&(sam->uni_acct_desc), sam_desc, len_sam_desc);
-}
-
/*******************************************************************
reads or writes a SAM_STR1 structure.
********************************************************************/
-void sam_io_sam_str1(char *desc, SAM_STR1 *sam, uint32 acct_buf, uint32 name_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static void sam_io_sam_str1(char *desc, SAM_STR1 *sam, uint32 acct_buf, uint32 name_buf, uint32 desc_buf, prs_struct *ps, int depth)
{
if (sam == NULL) return;
/*******************************************************************
makes a SAM_ENTRY1 structure.
********************************************************************/
-void make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
+static void make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
uint32 len_sam_name, uint32 len_sam_full, uint32 len_sam_desc,
uint32 rid_user, uint16 acb_info)
{
if (sam == NULL) return;
- DEBUG(5,("make_sam_entry1: %d\n", __LINE__));
+ DEBUG(5,("make_sam_entry1\n"));
sam->user_idx = user_idx;
sam->rid_user = rid_user;
/*******************************************************************
reads or writes a SAM_ENTRY1 structure.
********************************************************************/
-void sam_io_sam_entry1(char *desc, SAM_ENTRY1 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry1(char *desc, SAM_ENTRY1 *sam, prs_struct *ps, int depth)
{
if (sam == NULL) return;
smb_io_unihdr("unihdr", &(sam->hdr_user_desc), ps, depth); /* account name unicode string header */
}
-/*******************************************************************
-makes a SAM_STR2 structure.
-********************************************************************/
-void make_sam_str2(SAM_STR2 *sam, char *sam_acct, char *sam_desc)
-{
- int len_sam_acct = sam_acct != NULL ? strlen(sam_acct) : 0;
- int len_sam_desc = sam_desc != NULL ? strlen(sam_desc) : 0;
-
- if (sam == NULL) return;
-
- DEBUG(5,("make_sam_str2: %d\n", __LINE__));
-
- make_unistr2(&(sam->uni_srv_name), sam_acct, len_sam_acct);
- make_unistr2(&(sam->uni_srv_desc), sam_desc, len_sam_desc);
-}
-
/*******************************************************************
reads or writes a SAM_STR2 structure.
********************************************************************/
-void sam_io_sam_str2(char *desc, SAM_STR2 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static void sam_io_sam_str2(char *desc, SAM_STR2 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
{
if (sam == NULL) return;
/*******************************************************************
makes a SAM_ENTRY2 structure.
********************************************************************/
-void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx,
+static void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx,
uint32 len_sam_name, uint32 len_sam_desc,
uint32 rid_user, uint16 acb_info)
{
if (sam == NULL) return;
- DEBUG(5,("make_sam_entry2: %d\n", __LINE__));
+ DEBUG(5,("make_sam_entry2\n"));
sam->user_idx = user_idx;
sam->rid_user = rid_user;
/*******************************************************************
reads or writes a SAM_ENTRY2 structure.
********************************************************************/
-void sam_io_sam_entry2(char *desc, SAM_ENTRY2 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry2(char *desc, SAM_ENTRY2 *sam, prs_struct *ps, int depth)
{
if (sam == NULL) return;
smb_io_unihdr("unihdr", &(sam->hdr_srv_desc), ps, depth); /* account name unicode string header */
}
-/*******************************************************************
-makes a SAM_STR3 structure.
-********************************************************************/
-void make_sam_str3(SAM_STR3 *sam, char *grp_acct, char *grp_desc)
-{
- int len_grp_acct = strlen(grp_acct);
- int len_grp_desc = strlen(grp_desc);
-
- if (sam == NULL) return;
-
- DEBUG(5,("make_sam_str3: %d\n", __LINE__));
-
- make_unistr2(&(sam->uni_grp_name), grp_acct, len_grp_acct);
- make_unistr2(&(sam->uni_grp_desc), grp_desc, len_grp_desc);
-}
-
/*******************************************************************
reads or writes a SAM_STR3 structure.
********************************************************************/
-void sam_io_sam_str3(char *desc, SAM_STR3 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static void sam_io_sam_str3(char *desc, SAM_STR3 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
{
if (sam == NULL) return;
/*******************************************************************
makes a SAM_ENTRY3 structure.
********************************************************************/
-void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx,
+static void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx,
uint32 len_grp_name, uint32 len_grp_desc, uint32 rid_grp)
{
if (sam == NULL) return;
- DEBUG(5,("make_sam_entry3: %d\n", __LINE__));
+ DEBUG(5,("make_sam_entry3\n"));
sam->grp_idx = grp_idx;
sam->rid_grp = rid_grp;
/*******************************************************************
reads or writes a SAM_ENTRY3 structure.
********************************************************************/
-void sam_io_sam_entry3(char *desc, SAM_ENTRY3 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry3(char *desc, SAM_ENTRY3 *sam, prs_struct *ps, int depth)
{
if (sam == NULL) return;
/*******************************************************************
makes a SAM_ENTRY structure.
********************************************************************/
-void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
+static void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
{
if (sam == NULL) return;
- DEBUG(5,("make_sam_entry: %d\n", __LINE__));
+ DEBUG(5,("make_sam_entry\n"));
sam->rid = rid;
make_uni_hdr(&(sam->hdr_name), len_sam_name, len_sam_name, len_sam_name != 0);
/*******************************************************************
reads or writes a SAM_ENTRY structure.
********************************************************************/
-void sam_io_sam_entry(char *desc, SAM_ENTRY *sam, prs_struct *ps, int depth)
+static void sam_io_sam_entry(char *desc, SAM_ENTRY *sam, prs_struct *ps, int depth)
{
if (sam == NULL) return;
smb_io_unihdr("unihdr", &(sam->hdr_name), ps, depth); /* account name unicode string header */
}
+
/*******************************************************************
makes a SAMR_Q_ENUM_DOM_USERS structure.
********************************************************************/
q_e->max_size = size;
}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
if (num_sam_entries >= MAX_SAM_ENTRIES)
{
num_sam_entries = MAX_SAM_ENTRIES;
- DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+ DEBUG(5,("limiting number of entries to %d\n",
+ num_sam_entries));
}
r_u->total_num_entries = total_num_entries;
r_u->num_entries2 = num_sam_entries;
r_u->num_entries3 = num_sam_entries;
+ SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries);
+ SMB_ASSERT_ARRAY(r_u->uni_acct_name, num_sam_entries);
+
for (i = 0; i < num_sam_entries; i++)
{
make_sam_entry(&(r_u->sam[i]),
prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2));
prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
+ SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries2);
+
for (i = 0; i < r_u->num_entries2; i++)
{
prs_grow(ps);
sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
}
+ SMB_ASSERT_ARRAY(r_u->uni_acct_name, r_u->num_entries2);
+
for (i = 0; i < r_u->num_entries2; i++)
{
prs_grow(ps);
if (num_sam_entries >= MAX_SAM_ENTRIES)
{
num_sam_entries = MAX_SAM_ENTRIES;
- DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+ DEBUG(5,("limiting number of entries to %d\n",
+ num_sam_entries));
}
r_u->num_entries = num_sam_entries;
r_u->ptr_entries2 = 1;
r_u->num_entries3 = num_sam_entries;
+ SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries);
+
for (i = 0; i < num_sam_entries; i++)
{
make_sam_entry(&(r_u->sam[i]),
prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2));
prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3));
+ SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+
for (i = 0; i < r_u->num_entries; i++)
{
sam_io_sam_entry("", &(r_u->sam[i]), ps, depth);
prs_uint32("status", ps, depth, &(r_u->status));
}
+
/*******************************************************************
makes a SAMR_Q_QUERY_DISPINFO structure.
********************************************************************/
q_e->max_size = size;
}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
if (num_sam_entries >= MAX_SAM_ENTRIES)
{
num_sam_entries = MAX_SAM_ENTRIES;
- DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+ DEBUG(5,("limiting number of entries to %d\n",
+ num_sam_entries));
}
for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void sam_io_sam_info_2(char *desc, SAM_INFO_2 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_info_2(char *desc, SAM_INFO_2 *sam, prs_struct *ps, int depth)
{
int i;
prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 ));
+ SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+
for (i = 0; i < sam->num_entries; i++)
{
sam_io_sam_entry2("", &(sam->sam[i]), ps, depth);
if (num_sam_entries >= MAX_SAM_ENTRIES)
{
num_sam_entries = MAX_SAM_ENTRIES;
- DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+ DEBUG(5,("limiting number of entries to %d\n",
+ num_sam_entries));
}
for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void sam_io_sam_info_1(char *desc, SAM_INFO_1 *sam, prs_struct *ps, int depth)
+static void sam_io_sam_info_1(char *desc, SAM_INFO_1 *sam, prs_struct *ps, int depth)
{
int i;
prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 ));
+ SMB_ASSERT_ARRAY(sam->sam, sam->num_entries);
+
for (i = 0; i < sam->num_entries; i++)
{
sam_io_sam_entry1("", &(sam->sam[i]), ps, depth);
if (num_sam_entries >= MAX_SAM_ENTRIES)
{
num_sam_entries = MAX_SAM_ENTRIES;
- DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+ DEBUG(5,("limiting number of entries to %d\n",
+ num_sam_entries));
}
if (status == 0x0)
prs_uint32("num_entries2 ", ps, depth, &(r_u->num_entries2 ));
+ SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries);
+
for (i = 0; i < r_u->num_entries; i++)
{
sam_io_sam_entry3("", &(r_u->sam[i]), ps, depth);
prs_uint32("ptr ", ps, depth, &(q_u->ptr ));
prs_uint32("num_sids2", ps, depth, &(q_u->num_sids2));
+ SMB_ASSERT_ARRAY(q_u->ptr_sid, q_u->num_sids2);
+
for (i = 0; i < q_u->num_sids2; i++)
{
slprintf(tmp, sizeof(tmp) - 1, "ptr[%02d]", i);
r_u->ptr = 1;
r_u->num_entries2 = num_rids;
+ SMB_ASSERT_ARRAY(r_u->rid, num_rids);
+
for (i = 0; i < num_rids; i++)
{
r_u->rid[i] = rid[i];
if (r_u->num_entries != 0)
{
+ SMB_ASSERT_ARRAY(r_u->rid, r_u->num_entries2);
for (i = 0; i < r_u->num_entries2; i++)
{
prs_uint32("ptr ", ps, depth, &(q_u->ptr ));
prs_uint32("num_rids2", ps, depth, &(q_u->num_rids2));
+ SMB_ASSERT_ARRAY(q_u->hdr_user_name, q_u->num_rids2);
+
for (i = 0; i < q_u->num_rids2; i++)
{
smb_io_unihdr ("", &(q_u->hdr_user_name[i]), ps, depth);
r_u->undoc_buffer = 1;
r_u->num_entries2 = num_rids;
+ SMB_ASSERT_ARRAY(r_u->dom_rid, num_rids);
+
for (i = 0; i < num_rids; i++)
{
make_dom_rid3(&(r_u->dom_rid[i]), rid[i]);
if (r_u->num_entries != 0)
{
+ SMB_ASSERT_ARRAY(r_u->dom_rid, r_u->num_entries2);
+
for (i = 0; i < r_u->num_entries2; i++)
{
smb_io_dom_rid3("", &(r_u->dom_rid[i]), ps, depth);
prs_uint32("status", ps, depth, &(r_u->status));
}
-/*******************************************************************
-makes a SAMR_Q_UNKNOWN_12 structure.
-********************************************************************/
-void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
- POLICY_HND *pol, uint32 rid,
- uint32 num_gids, uint32 *gid)
-{
- int i;
- if (q_u == NULL) return;
-
- DEBUG(5,("make_samr_r_unknwon_12\n"));
-
- memcpy(&(q_u->pol), pol, sizeof(*pol));
-
- q_u->num_gids1 = num_gids;
- q_u->rid = rid;
- q_u->ptr = 0;
- q_u->num_gids2 = num_gids;
-
- for (i = 0; i < num_gids; i++)
- {
- q_u->gid[i] = gid[i];
- }
-}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
prs_uint32("ptr ", ps, depth, &(q_u->ptr ));
prs_uint32("num_gids2", ps, depth, &(q_u->num_gids2));
+ SMB_ASSERT_ARRAY(q_u->gid, q_u->num_gids2);
+
for (i = 0; i < q_u->num_gids2; i++)
{
slprintf(tmp, sizeof(tmp) - 1, "gid[%02d] ", i);
r_u->ptr_als_usrs = 1;
r_u->num_als_usrs2 = num_aliases;
+ SMB_ASSERT_ARRAY(r_u->hdr_als_name, num_aliases);
+
for (i = 0; i < num_aliases; i++)
{
int als_len = als_name[i] != NULL ? strlen(als_name[i]) : 0;
if (r_u->ptr_aliases != 0 && r_u->num_aliases1 != 0)
{
+ SMB_ASSERT_ARRAY(r_u->hdr_als_name, r_u->num_aliases2);
+
for (i = 0; i < r_u->num_aliases2; i++)
{
slprintf(tmp, sizeof(tmp) - 1, "als_hdr[%02d] ", i);
if (r_u->ptr_als_usrs != 0 && r_u->num_als_usrs1 != 0)
{
+ SMB_ASSERT_ARRAY(r_u->num_als_usrs, r_u->num_als_usrs2);
+
for (i = 0; i < r_u->num_als_usrs2; i++)
{
slprintf(tmp, sizeof(tmp) - 1, "als_usrs[%02d] ", i);
prs_uint32("status", ps, depth, &(r_u->status));
}
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
q_u->user_rid = rid;
}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
prs_uint32("status", ps, depth, &(r_u->status));
}
-
/*******************************************************************
makes a SAMR_Q_QUERY_USERGROUPS structure.
********************************************************************/
memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
}
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
r_u->num_entries2 = num_gids;
r_u->gid = gid;
-
-#if 0
- int i;
- for (i = 0; i < num_gids && i < LSA_MAX_GROUPS; i++)
- {
- r_u->gid[i].g_rid = gid[i].g_rid;
- r_u->gid[i].attr = gid[i].attr ;
- }
-#endif
-
}
else
{
q_u->switch_value = switch_value;
}
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
/*******************************************************************
reads or writes a LOGON_HRS structure.
********************************************************************/
-void sam_io_logon_hrs(char *desc, LOGON_HRS *hrs, prs_struct *ps, int depth)
+static void sam_io_logon_hrs(char *desc, LOGON_HRS *hrs, prs_struct *ps, int depth)
{
if (hrs == NULL) return;
prs_uint8s (False, "hours", ps, depth, hrs->hours, hrs->len);
}
-/*******************************************************************
-makes a SAM_USER_INFO_11 structure.
-********************************************************************/
-void make_sam_user_info11(SAM_USER_INFO_11 *usr,
- NTTIME *expiry,
- char *mach_acct,
- uint32 rid_user,
- uint32 rid_group,
- uint16 acct_ctrl)
-
-{
- int len_mach_acct;
- if (usr == NULL || expiry == NULL || mach_acct == NULL) return;
-
- DEBUG(5,("make_samr_r_unknown_24\n"));
-
- len_mach_acct = strlen(mach_acct);
-
- memcpy(&(usr->expiry),expiry, sizeof(usr->expiry)); /* expiry time or something? */
- bzero(usr->padding_1, sizeof(usr->padding_1)); /* 0 - padding 24 bytes */
-
- make_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct, len_mach_acct, 4); /* unicode header for machine account */
- usr->padding_2 = 0; /* 0 - padding 4 bytes */
-
- usr->ptr_1 = 1; /* pointer */
- bzero(usr->padding_3, sizeof(usr->padding_3)); /* 0 - padding 32 bytes */
- usr->padding_4 = 0; /* 0 - padding 4 bytes */
-
- usr->ptr_2 = 1; /* pointer */
- usr->padding_5 = 0; /* 0 - padding 4 bytes */
-
- usr->ptr_3 = 1; /* pointer */
- bzero(usr->padding_6, sizeof(usr->padding_6)); /* 0 - padding 32 bytes */
-
- usr->rid_user = rid_user;
- usr->rid_group = rid_group;
-
- usr->acct_ctrl = acct_ctrl;
- usr->unknown_3 = 0x0000;
-
- usr->unknown_4 = 0x003f; /* 0x003f - 16 bit unknown */
- usr->unknown_5 = 0x003c; /* 0x003c - 16 bit unknown */
-
- bzero(usr->padding_7, sizeof(usr->padding_7)); /* 0 - padding 16 bytes */
- usr->padding_8 = 0; /* 0 - padding 4 bytes */
-
- make_unistr2(&(usr->uni_mach_acct), mach_acct, len_mach_acct); /* unicode string for machine account */
-
- bzero(usr->padding_9, sizeof(usr->padding_9)); /* 0 - padding 48 bytes */
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void sam_io_user_info11(char *desc, SAM_USER_INFO_11 *usr, prs_struct *ps, int depth)
-{
- if (usr == NULL) return;
-
- prs_debug(ps, depth, desc, "samr_io_r_unknown_24");
- depth++;
-
- prs_align(ps);
-
- prs_uint8s (False, "padding_0", ps, depth, usr->padding_0, sizeof(usr->padding_0));
-
- smb_io_time("time", &(usr->expiry), ps, depth);
-
- prs_uint8s (False, "padding_1", ps, depth, usr->padding_1, sizeof(usr->padding_1));
-
- smb_io_unihdr ("unihdr", &(usr->hdr_mach_acct), ps, depth);
- prs_uint32( "padding_2", ps, depth, &(usr->padding_2));
-
- prs_uint32( "ptr_1 ", ps, depth, &(usr->ptr_1 ));
- prs_uint8s (False, "padding_3", ps, depth, usr->padding_3, sizeof(usr->padding_3));
- prs_uint32( "padding_4", ps, depth, &(usr->padding_4));
-
- prs_uint32( "ptr_2 ", ps, depth, &(usr->ptr_2 ));
- prs_uint32( "padding_5", ps, depth, &(usr->padding_5));
-
- prs_uint32( "ptr_3 ", ps, depth, &(usr->ptr_3 ));
- prs_uint8s (False, "padding_6", ps, depth, usr->padding_6, sizeof(usr->padding_6));
-
- prs_uint32( "rid_user ", ps, depth, &(usr->rid_user ));
- prs_uint32( "rid_group", ps, depth, &(usr->rid_group));
- prs_uint16( "acct_ctrl", ps, depth, &(usr->acct_ctrl));
- prs_uint16( "unknown_3", ps, depth, &(usr->unknown_3));
- prs_uint16( "unknown_4", ps, depth, &(usr->unknown_4));
- prs_uint16( "unknown_5", ps, depth, &(usr->unknown_5));
-
- prs_uint8s (False, "padding_7", ps, depth, usr->padding_7, sizeof(usr->padding_7));
- prs_uint32( "padding_8", ps, depth, &(usr->padding_8));
-
- smb_io_unistr2("unistr2", &(usr->uni_mach_acct), True, ps, depth);
- prs_align(ps);
-
- prs_uint8s (False, "padding_9", ps, depth, usr->padding_9, sizeof(usr->padding_9));
-}
-
/*************************************************************************
make_sam_user_info21
/*******************************************************************
reads or writes a structure.
********************************************************************/
-void sam_io_user_info21(char *desc, SAM_USER_INFO_21 *usr, prs_struct *ps, int depth)
+static void sam_io_user_info21(char *desc, SAM_USER_INFO_21 *usr, prs_struct *ps, int depth)
{
if (usr == NULL) return;
if (usr->ptr_logon_hrs)
{
sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs) , ps, depth);
+ prs_align(ps);
}
}
prs_uint32("status", ps, depth, &(r_u->status));
}
-
-/*******************************************************************
-makes a SAMR_Q_UNKNOWN_21 structure.
-********************************************************************/
-void make_samr_q_unknown_21(SAMR_Q_UNKNOWN_21 *q_c,
- POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
-{
- if (q_c == NULL || hnd == NULL) return;
-
- DEBUG(5,("make_samr_q_unknown_21\n"));
-
- memcpy(&(q_c->group_pol), hnd, sizeof(q_c->group_pol));
- q_c->unknown_1 = unk_1;
- q_c->unknown_2 = unk_2;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_q_unknown_21(char *desc, SAMR_Q_UNKNOWN_21 *q_u, prs_struct *ps, int depth)
-{
- if (q_u == NULL) return;
-
- prs_debug(ps, depth, desc, "samr_io_q_unknown_21");
- depth++;
-
- prs_align(ps);
-
- smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth);
- prs_align(ps);
-
- prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
- prs_uint16("unknown_2", ps, depth, &(q_u->unknown_2));
-}
-
-/*******************************************************************
-makes a SAMR_Q_UNKNOWN_13 structure.
-********************************************************************/
-void make_samr_q_unknown_13(SAMR_Q_UNKNOWN_13 *q_c,
- POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
-{
- if (q_c == NULL || hnd == NULL) return;
-
- DEBUG(5,("make_samr_q_unknown_13\n"));
-
- memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
- q_c->unknown_1 = unk_1;
- q_c->unknown_2 = unk_2;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-void samr_io_q_unknown_13(char *desc, SAMR_Q_UNKNOWN_13 *q_u, prs_struct *ps, int depth)
-{
- if (q_u == NULL) return;
-
- prs_debug(ps, depth, desc, "samr_io_q_unknown_13");
- depth++;
-
- prs_align(ps);
-
- smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
- prs_align(ps);
-
- prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
- prs_uint16("unknown_2", ps, depth, &(q_u->unknown_2));
-}
-
/*******************************************************************
reads or writes a structure.
********************************************************************/
DEBUG(5,("make_q_connect\n"));
/* make PDC server name \\server */
+ q_u->ptr_srv_name = len_srv_name > 0 ? 1 : 0;
make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name);
/* example values: 0x0000 0002 */
q_u->unknown_0 = unknown_0;
}
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
prs_uint32("status", ps, depth, &(r_u->status));
}
+/*******************************************************************
+makes a SAMR_Q_CONNECT_ANON structure.
+********************************************************************/
+void make_samr_q_connect_anon(SAMR_Q_CONNECT_ANON *q_u)
+{
+ if (q_u == NULL) return;
+
+ DEBUG(5,("make_q_connect_anon\n"));
+
+ q_u->ptr = 1;
+ q_u->unknown_0 = 0x5c;
+ q_u->unknown_1 = 0x01;
+ q_u->unknown_2 = 0x20;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_connect_anon(char *desc, SAMR_Q_CONNECT_ANON *q_u, prs_struct *ps, int depth)
+{
+ if (q_u == NULL) return;
+
+ prs_debug(ps, depth, desc, "samr_io_q_connect_anon");
+ depth++;
+
+ prs_align(ps);
+
+ prs_uint32("ptr ", ps, depth, &(q_u->ptr ));
+ prs_uint16("unknown_0", ps, depth, &(q_u->unknown_0));
+ prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
+ prs_uint32("unknown_2", ps, depth, &(q_u->unknown_2));
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_connect_anon(char *desc, SAMR_R_CONNECT_ANON *r_u, prs_struct *ps, int depth)
+{
+ if (r_u == NULL) return;
+
+ prs_debug(ps, depth, desc, "samr_io_r_connect_anon");
+ depth++;
+
+ prs_align(ps);
+
+ smb_io_pol_hnd("connect_pol", &(r_u->connect_pol), ps, depth);
+ prs_align(ps);
+
+ prs_uint32("status", ps, depth, &(r_u->status));
+}
+
/*******************************************************************
makes a SAMR_Q_OPEN_ALIAS structure.
********************************************************************/
prs_uint32("status", ps, depth, &(r_u->status));
}
+/*******************************************************************
+makes a SAMR_Q_UNKNOWN_12 structure.
+********************************************************************/
+void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
+ POLICY_HND *pol, uint32 rid,
+ uint32 num_gids, uint32 *gid)
+{
+ int i;
+ if (q_u == NULL) return;
+
+ DEBUG(5,("make_samr_r_unknwon_12\n"));
+
+ memcpy(&(q_u->pol), pol, sizeof(*pol));
+
+ q_u->num_gids1 = num_gids;
+ q_u->rid = rid;
+ q_u->ptr = 0;
+ q_u->num_gids2 = num_gids;
+
+ for (i = 0; i < num_gids; i++)
+ {
+ q_u->gid[i] = gid[i];
+ }
+}
+
+
+
+
+/*******************************************************************
+makes a SAMR_Q_UNKNOWN_21 structure.
+********************************************************************/
+void make_samr_q_unknown_21(SAMR_Q_UNKNOWN_21 *q_c,
+ POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
+{
+ if (q_c == NULL || hnd == NULL) return;
+
+ DEBUG(5,("make_samr_q_unknown_21\n"));
+
+ memcpy(&(q_c->group_pol), hnd, sizeof(q_c->group_pol));
+ q_c->unknown_1 = unk_1;
+ q_c->unknown_2 = unk_2;
+}
+
+
+/*******************************************************************
+makes a SAMR_Q_UNKNOWN_13 structure.
+********************************************************************/
+void make_samr_q_unknown_13(SAMR_Q_UNKNOWN_13 *q_c,
+ POLICY_HND *hnd, uint16 unk_1, uint16 unk_2)
+{
+ if (q_c == NULL || hnd == NULL) return;
+
+ DEBUG(5,("make_samr_q_unknown_13\n"));
+
+ memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
+ q_c->unknown_1 = unk_1;
+ q_c->unknown_2 = unk_2;
+}
+
+
/*******************************************************************
makes a SAMR_Q_UNKNOWN_38 structure.
********************************************************************/
/*******************************************************************
makes a SAMR_R_UNKNOWN_38 structure.
********************************************************************/
-void make_samr_r_unknown_38(SAMR_R_UNKNOWN_38 *r_u,
- uint16 level, uint32 status)
+void make_samr_r_unknown_38(SAMR_R_UNKNOWN_38 *r_u)
{
if (r_u == NULL) return;
DEBUG(5,("make_r_unknown_38\n"));
- r_u->level.value = level;
- r_u->ptr_0 = 0;
- r_u->status = status;
+ r_u->unk_0 = 0;
+ r_u->unk_1 = 0;
+ r_u->unk_2 = 0;
+ r_u->unk_3 = 0;
}
/*******************************************************************
prs_align(ps);
- smb_io_lookup_level("level ", &(r_u->level), ps, depth);
- prs_uint32("ptr_0 ", ps, depth, &(r_u->ptr_0 ));
- prs_uint32("status", ps, depth, &(r_u->status));
+ prs_uint16("unk_0", ps, depth, &(r_u->unk_0));
+ prs_align(ps);
+ prs_uint16("unk_1", ps, depth, &(r_u->unk_1));
+ prs_align(ps);
+ prs_uint16("unk_2", ps, depth, &(r_u->unk_2));
+ prs_align(ps);
+ prs_uint16("unk_3", ps, depth, &(r_u->unk_3));
+ prs_align(ps);
+}
+
+/*******************************************************************
+make a SAMR_ENC_PASSWD structure.
+********************************************************************/
+void make_enc_passwd(SAMR_ENC_PASSWD *pwd, char pass[512])
+{
+ if (pwd == NULL) return;
+
+ pwd->ptr = 1;
+ memcpy(&(pwd->pass), pass, sizeof(pwd->pass));
}
/*******************************************************************
prs_uint8s(False, "pwd", ps, depth, pwd->pass, sizeof(pwd->pass));
}
+/*******************************************************************
+makes a SAMR_ENC_HASH structure.
+********************************************************************/
+void make_enc_hash(SAMR_ENC_HASH *hsh, char hash[16])
+{
+ if (hsh == NULL) return;
+
+ hsh->ptr = 1;
+ memcpy(&(hsh->hash), hash, sizeof(hsh->hash));
+}
+
/*******************************************************************
reads or writes a SAMR_ENC_HASH structure.
********************************************************************/
prs_uint8s(False, "hash", ps, depth, hsh->hash, sizeof(hsh->hash));
}
-#if 0
-/* SAMR_Q_CHGPASSWD_USER */
-typedef struct q_samr_chgpasswd_user_info
+/*******************************************************************
+makes a SAMR_R_UNKNOWN_38 structure.
+********************************************************************/
+void make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
+ char *dest_host, char *user_name,
+ char nt_newpass[516], char nt_oldhash[16],
+ char lm_newpass[516], char lm_oldhash[16])
{
- uint32 ptr_0;
+ int len_dest_host = strlen(dest_host);
+ int len_user_name = strlen(user_name);
- UNIHDR hdr_server; /* server name unicode header */
- UNISTR2 uni_server; /* server name unicode string */
+ if (q_u == NULL) return;
- UNIHDR hdr_user_name; /* username unicode string header */
- UNISTR2 uni_user_name; /* username unicode string */
+ DEBUG(5,("make_samr_q_chgpasswd_user\n"));
- SAMR_ENC_PASSWD nt_newpass;
- SAMR_ENC_HASH nt_oldhash;
+ q_u->ptr_0 = 1;
+ make_uni_hdr(&(q_u->hdr_dest_host), len_dest_host, len_dest_host, len_dest_host != 0);
+ make_unistr2(&(q_u->uni_dest_host), dest_host, len_dest_host);
+ make_uni_hdr(&(q_u->hdr_user_name), len_user_name, len_user_name, len_user_name != 0);
+ make_unistr2(&(q_u->uni_user_name), user_name, len_user_name);
- uint32 unknown_1; /* seems to always contain 0001 */
+ make_enc_passwd(&(q_u->nt_newpass), nt_newpass);
+ make_enc_hash (&(q_u->nt_oldhash), nt_oldhash);
- SAMR_ENC_PASSWD lm_newpass;
- SAMR_ENC_HASH lm_oldhash;
+ q_u->unknown = 0x01;
-} SAMR_Q_CHGPASSWD_USER;
+ make_enc_passwd(&(q_u->lm_newpass), lm_newpass);
+ make_enc_hash (&(q_u->lm_oldhash), lm_oldhash);
+};
-/* SAMR_R_CHGPASSWD_USER */
-typedef struct r_samr_chgpasswd_user_info
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct *ps, int depth)
{
- uint32 result; /* 0 == OK, C000006A (NT_STATUS_WRONG_PASSWORD) */
+ if (q_u == NULL) return;
+
+ prs_debug(ps, depth, desc, "samr_io_q_chgpasswd_user");
+ depth++;
+
+ prs_align(ps);
+
+ prs_uint32("ptr_0", ps, depth, &(q_u->ptr_0));
+
+ smb_io_unihdr ("", &(q_u->hdr_dest_host), ps, depth);
+ smb_io_unistr2("", &(q_u->uni_dest_host), q_u->hdr_dest_host.buffer, ps, depth);
+ smb_io_unihdr ("", &(q_u->hdr_user_name), ps, depth);
+ smb_io_unistr2("", &(q_u->uni_user_name), q_u->hdr_user_name.buffer, ps, depth);
+
+ samr_io_enc_passwd("nt_newpass", &(q_u->nt_newpass), ps, depth);
+ samr_io_enc_hash ("nt_oldhash", &(q_u->nt_oldhash), ps, depth);
+
+ prs_uint32("unknown", ps, depth, &(q_u->unknown));
-} SAMR_R_CHGPASSWD_USER;
+ samr_io_enc_passwd("lm_newpass", &(q_u->lm_newpass), ps, depth);
+ samr_io_enc_hash ("lm_oldhash", &(q_u->lm_oldhash), ps, depth);
+}
+
+/*******************************************************************
+makes a SAMR_R_CHGPASSWD_USER structure.
+********************************************************************/
+void make_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status)
+{
+ if (r_u == NULL) return;
+
+ DEBUG(5,("make_r_chgpasswd_user\n"));
+
+ r_u->status = status;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct *ps, int depth)
+{
+ if (r_u == NULL) return;
+
+ prs_debug(ps, depth, desc, "samr_io_r_chgpasswd_user");
+ depth++;
+
+ prs_align(ps);
+
+ prs_uint32("status", ps, depth, &(r_u->status));
+}
-#endif /* 0 */
git.samba.org / samba.git / blobdiff