diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-01-29 21:22:08 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-01-29 21:22:08 +0000 |
| commit | 9b5043cb2f125c39eda1e986cfcce3b534dc3b43 (patch) | |
| tree | 8c23428f5f8cba9d6108a2e7a39edb68d93e47f8 /source3/rpc_parse | |
| parent | 5a9859c7b0e1d22cd92b3a512690c5113c1bd51b (diff) | |
| download | samba-9b5043cb2f125c39eda1e986cfcce3b534dc3b43.tar.gz samba-9b5043cb2f125c39eda1e986cfcce3b534dc3b43.tar.bz2 samba-9b5043cb2f125c39eda1e986cfcce3b534dc3b43.zip | |
fix for enumerate domain users (bug spotted by sean matthews).
also needed to use start index properly and generate next index.
both client and server code need to recognise error code 0x105
when there's not enough room to store all the users in one call.
sort this out another time.
(This used to be commit ad58cdfac6b85d9431216e32e532ad4d60f9c6dd)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_samr.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index f4c1790254..1fcb57c435 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -871,7 +871,7 @@ static void sam_io_sam_entry(char *desc, SAM_ENTRY *sam, prs_struct *ps, int de makes a SAMR_Q_ENUM_DOM_USERS structure. ********************************************************************/ void make_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_e, POLICY_HND *pol, - uint16 req_num_entries, uint16 unk_0, + uint32 start_idx, uint16 acb_mask, uint16 unk_1, uint32 size) { if (q_e == NULL || pol == NULL) return; @@ -880,8 +880,7 @@ void make_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_e, POLICY_HND *pol, memcpy(&(q_e->pol), pol, sizeof(*pol)); - q_e->req_num_entries = req_num_entries; /* zero indicates lots */ - q_e->unknown_0 = unk_0; /* this gets returned in the response */ + q_e->start_idx = start_idx; /* zero indicates lots */ q_e->acb_mask = acb_mask; q_e->unknown_1 = unk_1; q_e->max_size = size; @@ -902,13 +901,11 @@ void samr_io_q_enum_dom_users(char *desc, SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); prs_align(ps); - prs_uint16("req_num_entries", ps, depth, &(q_e->req_num_entries)); - prs_uint16("unknown_0 ", ps, depth, &(q_e->unknown_0 )); - - prs_uint16("acb_mask ", ps, depth, &(q_e->acb_mask )); - prs_uint16("unknown_1 ", ps, depth, &(q_e->unknown_1 )); + prs_uint32("start_idx", ps, depth, &(q_e->start_idx)); + prs_uint16("acb_mask ", ps, depth, &(q_e->acb_mask )); + prs_uint16("unknown_1", ps, depth, &(q_e->unknown_1)); - prs_uint32("max_size ", ps, depth, &(q_e->max_size )); + prs_uint32("max_size ", ps, depth, &(q_e->max_size )); prs_align(ps); } @@ -918,7 +915,7 @@ void samr_io_q_enum_dom_users(char *desc, SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc makes a SAMR_R_ENUM_DOM_USERS structure. ********************************************************************/ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u, - uint32 unk_0, + uint32 next_idx, uint32 num_sam_entries, SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES], uint32 status) { int i; @@ -934,7 +931,7 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u, num_sam_entries)); } - r_u->unknown_0 = unk_0; + r_u->next_idx = next_idx; if (num_sam_entries != 0) { @@ -981,7 +978,7 @@ void samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struc prs_align(ps); - prs_uint32("unknown_0 ", ps, depth, &(r_u->unknown_0 )); + prs_uint32("next_idx ", ps, depth, &(r_u->next_idx )); prs_uint32("ptr_entries1", ps, depth, &(r_u->ptr_entries1)); if (r_u->ptr_entries1 != 0) |