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_cm.c | |
| parent | 6b441e9e74b11bee4b661eaa17682d6351c264ff (diff) | |
| parent | edfcfefa37bf948c990e7ad3a1aea1dd4c3cea09 (diff) | |
| download | samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.gz samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.bz2 samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.zip | |
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit fbe5edec375c99421d19af086c4f597e70c963b8)
Diffstat (limited to 'source3/winbindd/winbindd_cm.c')
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index e12b13cbbd..4ff9fce96f 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1292,7 +1292,7 @@ static BOOL find_new_dc(TALLOC_CTX *mem_ctx, *addr = addrs[fd_index]; - if (*dcnames[fd_index] != '\0' && !is_ipaddress(dcnames[fd_index])) { + if (*dcnames[fd_index] != '\0' && !is_ipaddress_v4(dcnames[fd_index])) { /* Ok, we've got a name for the DC */ fstrcpy(dcname, dcnames[fd_index]); return True; @@ -1336,7 +1336,7 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain, saf_servername, domain->name )); /* convert an ip address to a name */ - if ( is_ipaddress( saf_servername ) ) { + if ( is_ipaddress_v4( saf_servername ) ) { fstring saf_name; struct in_addr ip; |