diff options
| author | Jeremy Allison <jra@samba.org> | 2008-06-20 12:49:14 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-06-20 12:49:14 -0700 |
| commit | 2a4b8fa6642204acb538cfb9d5e481538d9b53c0 (patch) | |
| tree | dcfa1cb92f132eb82be01d1e818a647b3adc1d3a /source3 | |
| parent | 37ae3f9c20b9882522abb33276e716dca296d63f (diff) | |
| download | samba-2a4b8fa6642204acb538cfb9d5e481538d9b53c0.tar.gz samba-2a4b8fa6642204acb538cfb9d5e481538d9b53c0.tar.bz2 samba-2a4b8fa6642204acb538cfb9d5e481538d9b53c0.zip | |
Fix bug #5533. Winbindd fails to cope correctly with a workgroup name containing a '.'.
Jeremy.
(This used to be commit 96325ff44dc404a68d4ebd423cf78210ec3ff902)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 6a96070f42..a35ba7bc06 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -165,15 +165,9 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const ZERO_STRUCTP(domain); - /* prioritise the short name */ - if (strchr_m(domain_name, '.') && alternative_name && *alternative_name) { - fstrcpy(domain->name, alternative_name); - fstrcpy(domain->alt_name, domain_name); - } else { - fstrcpy(domain->name, domain_name); - if (alternative_name) { - fstrcpy(domain->alt_name, alternative_name); - } + fstrcpy(domain->name, domain_name); + if (alternative_name) { + fstrcpy(domain->alt_name, alternative_name); } domain->methods = methods; |