diff options
author | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
---|---|---|
committer | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
commit | 89d33395e31a7ccb6b091e4a99a30d12e3367238 (patch) | |
tree | f2ec7c4ddbf9134ecae18e27bf792b90da372663 /source3/winbindd/winbindd_misc.c | |
parent | 6b441e9e74b11bee4b661eaa17682d6351c264ff (diff) | |
parent | edfcfefa37bf948c990e7ad3a1aea1dd4c3cea09 (diff) | |
download | samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.gz samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.xz samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.zip |
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit fbe5edec375c99421d19af086c4f597e70c963b8)
Diffstat (limited to 'source3/winbindd/winbindd_misc.c')
-rw-r--r-- | source3/winbindd/winbindd_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c index 5513e1790b..366f58a403 100644 --- a/source3/winbindd/winbindd_misc.c +++ b/source3/winbindd/winbindd_misc.c @@ -339,7 +339,7 @@ enum winbindd_result winbindd_dual_dsgetdcname(struct winbindd_domain *domain, } } - if ((!dc || !is_ipaddress(dc)) && info->domain_controller_name) { + if ((!dc || !is_ipaddress_v4(dc)) && info->domain_controller_name) { dc = info->domain_controller_name; } |