From: Ulrich Drepper Date: Wed, 1 Jul 2009 09:42:59 +0000 (-0700) Subject: Fix getnetbyaddr implementation. X-Git-Tag: fedora/glibc-2.10.1-3~4^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef626d54ac85934a002c120bf2443c6c6c4bd0ab;p=thirdparty%2Fglibc.git Fix getnetbyaddr implementation. There were two problems in the getnetbyaddr implementation. The type argument is pretty much useless since (almost) no input file contains this information and the NSS backends make up the value they fill in for the n_addrtype field. Therefore we now declare that passing AF_UNSPEC is always recognized. Secondly, the files backend didn't compare the network numbers with the correct endianess. Also change getent to take advantage of the type parameter change. (cherry picked from commit 29ba9812bb86bf6da9702f4fbff5cdbb25846401) --- diff --git a/ChangeLog b/ChangeLog index 3620d6252b4..0e5bcfce752 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-07-01 Ulrich Drepper + + * nss/nss_files/files-network.c (netbyaddr): If type is AF_UNSPEC, + recognize all types. Fix endianess in comparison of network number. + * nss/getent.c (networks_keys): Pass AF_UNSPEC instead of AF_UNIX + to getnetbyaddr. + 2009-06-24 Andreas Schwab * sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S: Fix cfa offset diff --git a/nss/getent.c b/nss/getent.c index ea5608f1e27..cda7d78ed47 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -469,7 +469,7 @@ networks_keys (int number, char *key[]) for (i = 0; i < number; ++i) { if (isdigit (key[i][0])) - net = getnetbyaddr (inet_addr (key[i]), AF_UNIX); + net = getnetbyaddr (inet_addr (key[i]), AF_UNSPEC); else net = getnetbyname (key[i]); diff --git a/nss/nss_files/files-network.c b/nss/nss_files/files-network.c index 9f4a3e03246..064de5a1435 100644 --- a/nss/nss_files/files-network.c +++ b/nss/nss_files/files-network.c @@ -1,5 +1,5 @@ /* Networks file parser in nss_files module. - Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1996-1998, 2000, 2001, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -81,7 +81,8 @@ DB_LOOKUP (netbyname, ,, DB_LOOKUP (netbyaddr, ,, { - if (result->n_addrtype == type && result->n_net == net) + if ((type == AF_UNSPEC || result->n_addrtype == type) + && result->n_net == htonl (net)) /* Bingo! */ break; }, uint32_t net, int type)