diff options
| author | Gerald Carter <jerry@samba.org> | 2004-01-08 22:21:39 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-01-08 22:21:39 +0000 |
| commit | 5982f2c17b38ba865371d648976cdb1282cf61e7 (patch) | |
| tree | b5527a4f1ba1f089b1c0aca2eacfc4665cc1afc6 | |
| parent | be7b27b78f7f2ea6e2b6251e33f09bd44f23b78f (diff) | |
| download | samba-5982f2c17b38ba865371d648976cdb1282cf61e7.tar.gz samba-5982f2c17b38ba865371d648976cdb1282cf61e7.tar.bz2 samba-5982f2c17b38ba865371d648976cdb1282cf61e7.zip | |
fix segfault when sid_ptr == 0 in DsEnumDomainTrusts() reply
(This used to be commit 36d985a75faa5ebda1c8c7de1e3ab5d7a51a9c10)
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 5 | ||||
| -rw-r--r-- | source3/rpc_client/cli_ds.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index f29ed37650..4cc43e85d6 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -107,8 +107,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const /* Create new domain entry */ - if ((domain = (struct winbindd_domain *) - malloc(sizeof(*domain))) == NULL) + if ((domain = (struct winbindd_domain *)malloc(sizeof(*domain))) == NULL) return NULL; /* Fill in fields */ @@ -146,7 +145,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const DEBUG(1,("Added domain %s %s %s\n", domain->name, domain->alt_name, - sid?sid_string_static(&domain->sid):"")); + &domain->sid?sid_string_static(&domain->sid):"")); return domain; } 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; |