sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-19 18:50:24 +03:00
Code

s3-netlogon: Fix crash bug in _netr_NetrEnumerateTrustedDomains().

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2010-05-31 21:26:30 +02:00
parent cf727404f4
commit fca69a9e2f
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source3/rpc_server/srv_netlog_nt.c
View File

@ -412,12 +412,6 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
return status;
}
trusted_domains = talloc_zero_array(p->mem_ctx, const char *, num_domains);
if (!trusted_domains) {
status = NT_STATUS_NO_MEMORY;
goto out;
}
status = rpccli_lsa_open_policy2(cli, p->mem_ctx,
true,
LSA_POLICY_VIEW_LOCAL_INFORMATION,
@ -426,10 +420,7 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
goto out;
}
status = STATUS_MORE_ENTRIES;
while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
do {
/* Lookup list of trusted domains */
status = rpccli_lsa_EnumTrustDom(cli, p->mem_ctx,
@ -450,16 +441,18 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
goto out;
}
}
}
} while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
/* multi sz terminate */
trusted_domains = talloc_realloc(p->mem_ctx, trusted_domains, const char *, num_domains + 1);
if (trusted_domains == NULL) {
status = NT_STATUS_NO_MEMORY;
goto out;
}
if (num_domains > 0) {
/* multi sz terminate */
trusted_domains = talloc_realloc(p->mem_ctx, trusted_domains, const char *, num_domains + 1);
if (trusted_domains == NULL) {
status = NT_STATUS_NO_MEMORY;
goto out;
}
trusted_domains[num_domains+1] = NULL;
trusted_domains[num_domains] = NULL;
}
if (!push_reg_multi_sz(trusted_domains, &blob, trusted_domains)) {
TALLOC_FREE(trusted_domains);