mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 06:50:07 +00:00
29ba9812bb
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.
89 lines
2.3 KiB
C
89 lines
2.3 KiB
C
/* Networks file parser in nss_files module.
|
|
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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
|
|
#define ENTNAME netent
|
|
#define DATABASE "networks"
|
|
#define NEED_H_ERRNO
|
|
|
|
struct netent_data {};
|
|
|
|
#define TRAILING_LIST_MEMBER n_aliases
|
|
#define TRAILING_LIST_SEPARATOR_P isspace
|
|
#include "files-parse.c"
|
|
LINE_PARSER
|
|
("#",
|
|
{
|
|
char *addr;
|
|
char *cp;
|
|
int n = 1;
|
|
|
|
STRING_FIELD (result->n_name, isspace, 1);
|
|
|
|
STRING_FIELD (addr, isspace, 1);
|
|
/* 'inet_network' does not add zeroes at the end if the network number
|
|
does not four byte values. We add them outselves if necessary. */
|
|
cp = strchr (addr, '.');
|
|
if (cp != NULL)
|
|
{
|
|
++n;
|
|
cp = strchr (cp + 1, '.');
|
|
if (cp != NULL)
|
|
{
|
|
++n;
|
|
cp = strchr (cp + 1, '.');
|
|
if (cp != NULL)
|
|
++n;
|
|
}
|
|
}
|
|
if (n < 4)
|
|
{
|
|
char *newp = (char *) alloca (strlen (addr) + (4 - n) * 2 + 1);
|
|
cp = stpcpy (newp, addr);
|
|
do
|
|
{
|
|
*cp++ = '.';
|
|
*cp++ = '0';
|
|
}
|
|
while (++n < 4);
|
|
*cp = '\0';
|
|
addr = newp;
|
|
}
|
|
result->n_net = inet_network (addr);
|
|
result->n_addrtype = AF_INET;
|
|
|
|
})
|
|
|
|
#include "files-XXX.c"
|
|
|
|
DB_LOOKUP (netbyname, ,,
|
|
LOOKUP_NAME_CASE (n_name, n_aliases),
|
|
const char *name)
|
|
|
|
DB_LOOKUP (netbyaddr, ,,
|
|
{
|
|
if ((type == AF_UNSPEC || result->n_addrtype == type)
|
|
&& result->n_net == htonl (net))
|
|
/* Bingo! */
|
|
break;
|
|
}, uint32_t net, int type)
|