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.

diff --git a/ChangeLog b/ChangeLog
index 7a25874b7331c7a6b7708ab15a6aac8b0da1e698..714d114d5ef83993847f0c2e9643d78aa19b9c51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-01  Ulrich Drepper  <drepper@redhat.com>
+
+       * 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-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/multiarch/ifunc-defines.sym (FAMILIY_OFFSET): Define.

diff --git a/nss/getent.c b/nss/getent.c
index 3a9430fd661ff0d363fe2f3eb44d3acf1182f9aa..3a482e140f3361e0684765e0f84d82cf07a75eeb 100644 (file)
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -534,7 +534,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 9f4a3e032462fec64b370bc1d455308957b84132..064de5a143516d9f03ee21910d7c02b07660c2b0 100644 (file)
--- 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)