mirror of
https://github.com/samba-team/samba.git
synced 2025-03-12 20:58:37 +03:00
r22630: Revert svn r22576 (parse change to enum_aliasmem(). Original code was correct
(This used to be commit cf11b4314987d4d429d09e073c5294d3a9977c52)
This commit is contained in:
parent
b3010b5d6b
commit
a127d5331a
@ -4838,15 +4838,9 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
|
||||
if(!prs_uint32("num_sids1", ps, depth, &r_u->num_sids1))
|
||||
return False;
|
||||
|
||||
if (UNMARSHALLING(ps)) {
|
||||
if (r_u->num_sids1) {
|
||||
ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
|
||||
if (!ptr_sid) {
|
||||
return False;
|
||||
}
|
||||
} else {
|
||||
ptr_sid = NULL;
|
||||
}
|
||||
ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
|
||||
if (!ptr_sid) {
|
||||
return False;
|
||||
}
|
||||
|
||||
for (i = 0; i < r_u->num_sids1; i++) {
|
||||
@ -4856,14 +4850,7 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
|
||||
}
|
||||
|
||||
if (UNMARSHALLING(ps)) {
|
||||
if (r_u->num_sids1) {
|
||||
r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
|
||||
if (!r_u->sid) {
|
||||
return False;
|
||||
}
|
||||
} else {
|
||||
r_u->sid = NULL;
|
||||
}
|
||||
r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
|
||||
}
|
||||
|
||||
for (i = 0; i < r_u->num_sids1; i++) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user