From 5982f2c17b38ba865371d648976cdb1282cf61e7 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 8 Jan 2004 22:21:39 +0000 Subject: fix segfault when sid_ptr == 0 in DsEnumDomainTrusts() reply (This used to be commit 36d985a75faa5ebda1c8c7de1e3ab5d7a51a9c10) --- source3/rpc_client/cli_ds.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/rpc_client/cli_ds.c') diff --git a/source3/rpc_client/cli_ds.c b/source3/rpc_client/cli_ds.c index f8455edcd9..8c2821d5af 100644 --- a/source3/rpc_client/cli_ds.c +++ b/source3/rpc_client/cli_ds.c @@ -127,19 +127,19 @@ NTSTATUS cli_ds_enum_domain_trusts(struct cli_state *cli, TALLOC_CTX *mem_ctx, (*trusts)[i].trust_attributes = r.domains.trusts[i].trust_attributes; (*trusts)[i].guid = r.domains.trusts[i].guid; - if (&r.domains.trusts[i].sid_ptr) { + if (r.domains.trusts[i].sid_ptr) { sid_copy(&(*trusts)[i].sid, &r.domains.trusts[i].sid.sid); } else { ZERO_STRUCT((*trusts)[i].sid); } - if (&r.domains.trusts[i].netbios_ptr) { + if (r.domains.trusts[i].netbios_ptr) { (*trusts)[i].netbios_domain = unistr2_tdup( mem_ctx, &r.domains.trusts[i].netbios_domain ); } else { (*trusts)[i].netbios_domain = NULL; } - if (&r.domains.trusts[i].dns_ptr) { + if (r.domains.trusts[i].dns_ptr) { (*trusts)[i].dns_domain = unistr2_tdup( mem_ctx, &r.domains.trusts[i].dns_domain ); } else { (*trusts)[i].dns_domain = NULL; -- cgit