AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix getnetbyaddr implementation.

Browse Source 
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.
This commit is contained in:
Ulrich Drepper 2009-07-01 02:42:59 -07:00
parent e6bd12ddf7
commit 29ba9812bb
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

2
nss/getent.c
View File

@ -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]);

5
nss/nss_files/files-network.c
View File

@ -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)