diff options
| author | Gerald Carter <jerry@samba.org> | 2004-01-08 22:21:29 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-01-08 22:21:29 +0000 |
| commit | 6c39789e6f1e7003713e6371fc1d1fd610538b2d (patch) | |
| tree | 70fd44ed325c373f305e6f28bac9d3526d0d0fed /source3/nsswitch | |
| parent | 4fe1c0cd139ec96b98a3507a754d0a0dc30356d3 (diff) | |
| download | samba-6c39789e6f1e7003713e6371fc1d1fd610538b2d.tar.gz samba-6c39789e6f1e7003713e6371fc1d1fd610538b2d.tar.bz2 samba-6c39789e6f1e7003713e6371fc1d1fd610538b2d.zip | |
fix segfault when sid_ptr == 0 in DsEnumDomainTrusts() reply
(This used to be commit ba9dc0d9fd3e30a7ddf97b6a4df753db7ba12cc1)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 29a4ca93eb..076ab1a2fc 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -123,8 +123,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 */ @@ -164,7 +163,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; } |