diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-11-15 23:46:27 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-11-15 23:46:27 +0000 |
| commit | 089b57b5b4e81ceb854f10e89c5d83fc885f8809 (patch) | |
| tree | 5962f314f49198607af2a7439c6549a87dcca18e /source3/rpc_parse | |
| parent | 98ee99eb72e537c1a69317cc81305d728e40ab64 (diff) | |
| download | samba-089b57b5b4e81ceb854f10e89c5d83fc885f8809.tar.gz samba-089b57b5b4e81ceb854f10e89c5d83fc885f8809.tar.bz2 samba-089b57b5b4e81ceb854f10e89c5d83fc885f8809.zip | |
added server-side samr enum domains. fixed some parsing issues, server-side.
(This used to be commit 60b0840106a6f5c283a8339428f3cfeb62398355)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_samr.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index ab45152db0..90ae3e8fee 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -1136,7 +1136,7 @@ static BOOL make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid) { if (sam == NULL) return False; - DEBUG(5,("make_sam_entry\n")); + DEBUG(10,("make_sam_entry: %d %d\n", len_sam_name, rid)); sam->rid = rid; make_uni_hdr(&(sam->hdr_name), len_sam_name); @@ -1278,9 +1278,6 @@ BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struct prs_debug(ps, depth, desc, "samr_io_r_enum_dom_users"); depth++; - r_u->sam = NULL; - r_u->uni_acct_name = NULL; - prs_align(ps); prs_uint32("next_idx ", ps, depth, &(r_u->next_idx )); @@ -2865,9 +2862,6 @@ BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS *r_u, prs_struct *ps prs_debug(ps, depth, desc, "samr_io_r_enum_domains"); depth++; - r_u->sam = NULL; - r_u->uni_dom_name = NULL; - prs_align(ps); prs_uint32("next_idx ", ps, depth, &(r_u->next_idx )); @@ -2895,14 +2889,18 @@ BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS *r_u, prs_struct *ps for (i = 0; i < r_u->num_entries2; i++) { + fstring tmp; + slprintf(tmp, sizeof(tmp)-1, "dom[%d]", i); prs_grow(ps); - sam_io_sam_entry("", &(r_u->sam[i]), ps, depth); + sam_io_sam_entry(tmp, &(r_u->sam[i]), ps, depth); } for (i = 0; i < r_u->num_entries2; i++) { + fstring tmp; + slprintf(tmp, sizeof(tmp)-1, "dom[%d]", i); prs_grow(ps); - smb_io_unistr2("", &(r_u->uni_dom_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth); + smb_io_unistr2(tmp, &(r_u->uni_dom_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth); } prs_align(ps); @@ -3028,9 +3026,6 @@ BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_stru prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups"); depth++; - r_u->sam = NULL; - r_u->uni_grp_name = NULL; - prs_align(ps); prs_uint32("next_idx ", ps, depth, &(r_u->next_idx )); @@ -3191,9 +3186,6 @@ BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES *r_u, prs_st prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases"); depth++; - r_u->sam = NULL; - r_u->uni_grp_name = NULL; - prs_align(ps); prs_uint32("next_idx ", ps, depth, &(r_u->next_idx )); |