diff options
| author | Jeremy Allison <jra@samba.org> | 2008-06-20 12:49:14 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-06-20 23:06:37 +0200 |
| commit | 23f096504fa53ee9957dce1c2b2902cf4f8ab937 (patch) | |
| tree | 0b8e149cb1d24858d42650052ed954a16e77700c /source | |
| parent | 4580a491d2341a70a7e8e869e2fb249be2d25dcd (diff) | |
| download | samba-23f096504fa53ee9957dce1c2b2902cf4f8ab937.tar.gz | |
Fix bug #5533. Winbindd fails to cope correctly with a workgroup name containing a '.'.
Jeremy.
(cherry picked from commit fae027e937c2f0078193b8cc27af6db2d7c233f5)
Diffstat (limited to 'source')
| -rw-r--r-- | source/winbindd/winbindd_util.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c index 6a96070f427..a35ba7bc067 100644 --- a/source/winbindd/winbindd_util.c +++ b/source/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; |