diff options
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 20460ba172..9de81c33e5 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -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) { |