From 75c95410b7b80289663bf2ba828e84d2c7890369 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 20 Oct 2004 10:47:20 +0000 Subject: Updated to fedora-glibc-20041018T0940 --- nss/getent.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'nss') diff --git a/nss/getent.c b/nss/getent.c index f9f0a6e22a..c0a273241f 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -276,19 +276,12 @@ hosts_keys (int number, char *key[]) for (i = 0; i < number; ++i) { struct hostent *host = NULL; + char addr[IN6ADDRSZ]; - if (strchr (key[i], ':') != NULL) - { - char addr[IN6ADDRSZ]; - if (inet_pton (AF_INET6, key[i], &addr)) - host = gethostbyaddr (addr, sizeof (addr), AF_INET6); - } - else if (isdigit (key[i][0])) - { - char addr[INADDRSZ]; - if (inet_pton (AF_INET, key[i], &addr)) - host = gethostbyaddr (addr, sizeof (addr), AF_INET); - } + if (inet_pton (AF_INET6, key[i], &addr) > 0) + host = gethostbyaddr (addr, sizeof (addr), AF_INET6); + else if (inet_pton (AF_INET, key[i], &addr) > 0) + host = gethostbyaddr (addr, sizeof (addr), AF_INET); else if ((host = gethostbyname2 (key[i], AF_INET6)) == NULL) host = gethostbyname2 (key[i], AF_INET); -- cgit 1.4.1