diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nss/getent.c | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 54ec7e1b68..4594957ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-19 Ulrich Drepper <drepper@redhat.com> + + * nss/getent.c (hosts_keys): Let inet_pton decide whether the + string is an address or not. + 2004-10-19 Jakub Jelinek <jakub@redhat.com> * elf/dl-addr.c (_dl_addr): Don't look at STT_TLS symbols. 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); |