summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-05-25 14:05:18 +0200
committerKarolin Seeger <kseeger@samba.org>2009-06-06 14:27:52 +0200
commit6ad726f50ee10ac2a2f157906b3b3adb88bfea37 (patch)
treebb056937ecbe79592ea234756cc0276f19dabf51
parent6da23f8f0d4d045095d965ff62b7892c645fa139 (diff)
downloadsamba-6ad726f50ee10ac2a2f157906b3b3adb88bfea37.tar.gz
samba-6ad726f50ee10ac2a2f157906b3b3adb88bfea37.tar.xz
samba-6ad726f50ee10ac2a2f157906b3b3adb88bfea37.zip
s3-samr: Fix Bug #6372, usermanager only displaying 1024 groups and aliases.
This is now also verified with the RPC-SAMR-LARGE-DC test. Guenther (cherry picked from commit fca7dce1a908570e463ddcbd663955fcafd1d843)
-rw-r--r--source/rpc_server/srv_samr_nt.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index f14c53b20a3..a394eb3b90c 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1165,6 +1165,12 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
make_group_sam_entry_list(p->mem_ctx, &samr_entries,
num_groups, groups);
+ if (MAX_SAM_ENTRIES <= num_groups) {
+ status = STATUS_MORE_ENTRIES;
+ } else {
+ status = NT_STATUS_OK;
+ }
+
samr_array->count = num_groups;
samr_array->entries = samr_entries;
@@ -1233,6 +1239,12 @@ NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
DEBUG(5,("_samr_EnumDomainAliases: %d\n", __LINE__));
+ if (MAX_SAM_ENTRIES <= num_aliases) {
+ status = STATUS_MORE_ENTRIES;
+ } else {
+ status = NT_STATUS_OK;
+ }
+
samr_array->count = num_aliases;
samr_array->entries = samr_entries;