summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-10-20 19:04:06 +0000
committerJeremy Allison <jra@samba.org>2003-10-20 19:04:06 +0000
commit72569b4f1eb90d56a032e9d12fd97a5531a2467c (patch)
tree2918df2906e46256aff0c32a2eda837ffed8f383
parent9d959807ff343107427589f36802b97583db79f6 (diff)
downloadsamba-72569b4f1eb90d56a032e9d12fd97a5531a2467c.tar.gz
samba-72569b4f1eb90d56a032e9d12fd97a5531a2467c.tar.bz2
samba-72569b4f1eb90d56a032e9d12fd97a5531a2467c.zip
Merge Volker's fix.
It's a perfectly valid condition to have zero alias members. Jeremy. (This used to be commit aa7fb71357921c9d1fa1d32e5eaff912428e4fdf)
-rw-r--r--source3/rpc_client/cli_samr.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index f985ee9979..e5e67f39dc 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -865,6 +865,12 @@ NTSTATUS cli_samr_query_aliasmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
*num_mem = r.num_sids;
+ if (*num_mem == 0) {
+ *sids = NULL;
+ result = NT_STATUS_OK;
+ goto done;
+ }
+
if (!(*sids = talloc(mem_ctx, sizeof(DOM_SID) * *num_mem))) {
result = NT_STATUS_UNSUCCESSFUL;
goto done;