summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-01-29 20:15:35 +0000
committerJeremy Allison <jra@samba.org>2003-01-29 20:15:35 +0000
commitf8601187caac93c5b03b2a5c6f06c674291a0a17 (patch)
treeb7bc3f4c54051f8e8bf1be57b7dc7c2222d466c7 /source3/utils
parentaed54afc2cfc468d29b65b2b503d975070515528 (diff)
downloadsamba-f8601187caac93c5b03b2a5c6f06c674291a0a17.tar.gz
samba-f8601187caac93c5b03b2a5c6f06c674291a0a17.tar.bz2
samba-f8601187caac93c5b03b2a5c6f06c674291a0a17.zip
Merge tpot's changes to request the correct sizes for user dispinfo
from HEAD. I had to do this for him as he was *so* tired, the poor chap, plus he has this bad leg, plus the dog ate his homework etc. etc. Jeremy. (This used to be commit 1e752b48a12cdcf2cb6343705be83f304e5ee2b6)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_rpc.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 60adcfdf6e..922fc027e6 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -779,7 +779,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, struct cli_state *cli,
{
POLICY_HND connect_pol, domain_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- uint32 start_idx=0, max_entries=250, num_entries, i;
+ uint32 start_idx=0, num_entries, i, loop_count = 0;
SAM_DISPINFO_CTR ctr;
SAM_DISPINFO_1 info1;
@@ -809,9 +809,16 @@ rpc_user_list_internals(const DOM_SID *domain_sid, struct cli_state *cli,
"\n-----------------------------\n");
do {
fstring user, desc;
+ uint32 max_entries, max_size;
+
+ get_query_dispinfo_params(
+ loop_count, &max_entries, &max_size);
+
result = cli_samr_query_dispinfo(cli, mem_ctx, &domain_pol,
&start_idx, 1, &num_entries,
- max_entries, &ctr);
+ max_entries, max_size, &ctr);
+ loop_count++;
+
for (i = 0; i < num_entries; i++) {
unistr2_to_ascii(user, &(&ctr.sam.info1->str[i])->uni_acct_name, sizeof(user)-1);
if (opt_long_list_entries)