sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r595: nicer handling on max_size multiplier

Browse Source 
(This used to be commit 994baba7ebc267cb3051109aee022d71472aa6b6)
This commit is contained in:
Andrew Tridgell 2004-05-09 00:42:09 +00:00 committed by Gerald (Jerry) Carter
parent 961060351e
commit 1d5c2c364e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/rpc_server/samr/dcesrv_samr.c
View File

@ -647,7 +647,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
if (count == -1) {
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
if (count == 0) {
if (count == 0 || r->in.max_size == 0) {
return NT_STATUS_OK;
}
@ -677,7 +677,8 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
/* return the rest, limit by max_size. Note that we
use the w2k3 element size value of 54 */
r->out.num_entries = count - first;
r->out.num_entries = MIN(r->out.num_entries, 1+(r->in.max_size/54));
r->out.num_entries = MIN(r->out.num_entries,
1+(r->in.max_size/SAMR_ENUM_USERS_MULTIPLIER));
r->out.sam = talloc_p(mem_ctx, struct samr_SamArray);
if (!r->out.sam) {