diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-29 21:13:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:46 -0500 |
| commit | 138668d5d284f7d2496f22c16a99be107cdfc872 (patch) | |
| tree | 9bd5fb94a64173bd6a9325a1ecfc7bb4ccf34129 /source3/rpc_parse/parse_lsa.c | |
| parent | 571845991e137eb5f166d54c59a9e7efc1d565af (diff) | |
| download | samba-138668d5d284f7d2496f22c16a99be107cdfc872.tar.gz samba-138668d5d284f7d2496f22c16a99be107cdfc872.tar.bz2 samba-138668d5d284f7d2496f22c16a99be107cdfc872.zip | |
r22577: Change all of parse/*.c to use standard form. Fix some
marshalling bugs.
Jeremy.
(This used to be commit 3df99006f8a52af7cff0fbca1bf16157a8648254)
Diffstat (limited to 'source3/rpc_parse/parse_lsa.c')
| -rw-r--r-- | source3/rpc_parse/parse_lsa.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c index e1630f79f4..cbbba7f3e9 100644 --- a/source3/rpc_parse/parse_lsa.c +++ b/source3/rpc_parse/parse_lsa.c @@ -573,14 +573,17 @@ void init_r_enum_trust_dom(TALLOC_CTX *ctx, LSA_R_ENUM_TRUST_DOM *out, return; } - out->domlist->domains = TALLOC_ARRAY( ctx, DOMAIN_INFO, + if (out->count) { + out->domlist->domains = TALLOC_ARRAY( ctx, DOMAIN_INFO, out->count ); - - if ( !out->domlist->domains ) { - out->status = NT_STATUS_NO_MEMORY; - return; + if ( !out->domlist->domains ) { + out->status = NT_STATUS_NO_MEMORY; + return; + } + } else { + out->domlist->domains = NULL; } - + out->domlist->count = out->count; /* initialize the list of domains and their sid */ |