This patch will fix a problem when the same host is defined with both IPv4 and

IPv6 entries in /etc/hosts. Previous only the first of these host would work,
as uClibc would read the /etc/hosts file from top to bottom, failing if the
first hit did not match the IP type.

Now uClibc will continue reading, even if the first correct entry name, but wrong IP
type fails. Thus, allowing a second correct entry name with correct IP type
will result in a name resolve.

Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>

diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 749c647..7f9d7d5 100644 (file)
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -1650,9 +1650,15 @@ int attribute_hidden __read_etc_hosts_r(FILE * fp, const char * name, int type,
                        ret = NETDB_SUCCESS;
 #endif /* __UCLIBC_HAS_IPV6__ */
                } else {
-                       DPRINTF("Error\n");
+                       /* continue parsing in the hope the user has multiple
+                        * host types listed in the database like so:
+                        * <ipv4 addr> host
+                        * <ipv6 addr> host
+                        * If looking for an IPv6 addr, don't bail when we got the IPv4
+                        */
+                       DPRINTF("Error: Found host but diff network type\n");
                        ret = TRY_AGAIN;
-                       break; /* bad ip address */
+                       continue;
                }
 
                if (action != GETHOSTENT)