diff options
| author | Andreas Schneider <asn@samba.org> | 2013-02-25 09:31:12 +0100 |
|---|---|---|
| committer | David Disseldorp <ddiss@suse.de> | 2013-03-05 23:29:29 +0100 |
| commit | 659dd65f8f5c352a4cd17e072929a8cc0b6e4d34 (patch) | |
| tree | e42a4edba7eef49be14fdd923a90928a3243a968 /source3/winbindd/winbindd_dual.c | |
| parent | 14bae61ba36814ea5eca7c51cf1cc039e9e6803f (diff) | |
| download | samba-659dd65f8f5c352a4cd17e072929a8cc0b6e4d34.tar.gz samba-659dd65f8f5c352a4cd17e072929a8cc0b6e4d34.tar.bz2 samba-659dd65f8f5c352a4cd17e072929a8cc0b6e4d34.zip | |
winbind: Correctly use names in the domain struct.
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/winbindd/winbindd_dual.c')
| -rw-r--r-- | source3/winbindd/winbindd_dual.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index c752ffeaac..e1e45d4910 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -378,12 +378,15 @@ static void wb_domain_request_initialized(struct tevent_req *subreq) return; } - talloc_free(state->domain->alt_name); - state->domain->alt_name = talloc_strdup(state->domain, - response->data.domain_info.alt_name); - if (state->domain->alt_name == NULL) { - tevent_req_error(req, ENOMEM); - return; + if (response->data.domain_info.alt_name[0] != '\0') { + talloc_free(state->domain->alt_name); + + state->domain->alt_name = talloc_strdup(state->domain, + response->data.domain_info.alt_name); + if (state->domain->alt_name == NULL) { + tevent_req_error(req, ENOMEM); + return; + } } state->domain->native_mode = response->data.domain_info.native_mode; @@ -539,7 +542,7 @@ void winbind_child_died(pid_t pid) void winbindd_flush_negative_conn_cache(struct winbindd_domain *domain) { flush_negative_conn_cache_for_domain(domain->name); - if (*domain->alt_name) { + if (domain->alt_name != NULL) { flush_negative_conn_cache_for_domain(domain->alt_name); } } |