diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-08-24 08:21:41 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-08-24 08:21:41 -0700 |
| commit | e5911f31286179c1e4dc9bb2691e5098c6e3d20e (patch) | |
| tree | 72af73ecf9f35ceafef7f2bb9d8f60484b809210 /libc/netbsd/net/getaddrinfo.c | |
| parent | 9fd0cf81702d083b39a839b07ad75d2ff0ac277d (diff) | |
| parent | 937c374225c2f98862e1746c9509970d1b2257d6 (diff) | |
| download | android_bionic-e5911f31286179c1e4dc9bb2691e5098c6e3d20e.tar.gz android_bionic-e5911f31286179c1e4dc9bb2691e5098c6e3d20e.tar.bz2 android_bionic-e5911f31286179c1e4dc9bb2691e5098c6e3d20e.zip | |
resolved conflicts for merge of 937c3742 to klp-dev-plus-aosp
Change-Id: I4c0ad42ea3802cd232c80e5589af8a8e25f88a60
Diffstat (limited to 'libc/netbsd/net/getaddrinfo.c')
| -rw-r--r-- | libc/netbsd/net/getaddrinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/netbsd/net/getaddrinfo.c b/libc/netbsd/net/getaddrinfo.c index 8c1a01b5d..937c42350 100644 --- a/libc/netbsd/net/getaddrinfo.c +++ b/libc/netbsd/net/getaddrinfo.c @@ -1874,10 +1874,10 @@ static bool _using_default_dns(const char *iface) if (iface == NULL || *iface == '\0') return true; if_len = _resolv_get_default_iface(buf, sizeof(buf)); - if (if_len + 1 <= sizeof(buf)) { - if (strcmp(buf, iface) != 0) return false; + if (if_len != 0 && if_len + 1 <= sizeof(buf)) { + if (strcmp(buf, iface) == 0) return true; } - return true; + return false; } /*ARGSUSED*/ |