mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
4969890247
nss_db uses nss_files code for services, but a continue on protocol mismatch that doesn't affect nss_files skipped the code that advanced to the next db entry. Any one of these changes would suffice to fix it, but fixing both makes them both safer to reuse elsewhere. for ChangeLog [BZ #14498] * NEWS: Fixed. * nss/nss_db/db-XXX.c (_nss_db_get##name##_r): Update hidx after parsing line but before break_if_match. * nss/nss_files/files-service (DB_LOOKUP): Don't "continue;" if there is a protocol mismatch.
64 lines
2.1 KiB
C
64 lines
2.1 KiB
C
/* Services file parser in nss_files module.
|
|
Copyright (C) 1996-2014 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <netinet/in.h>
|
|
#include <netdb.h>
|
|
|
|
|
|
#define ENTNAME servent
|
|
#define DATABASE "services"
|
|
|
|
struct servent_data {};
|
|
|
|
#define TRAILING_LIST_MEMBER s_aliases
|
|
#define TRAILING_LIST_SEPARATOR_P isspace
|
|
#include "files-parse.c"
|
|
#define ISSLASH(c) ((c) == '/')
|
|
LINE_PARSER
|
|
("#",
|
|
STRING_FIELD (result->s_name, isspace, 1);
|
|
INT_FIELD (result->s_port, ISSLASH, 10, 0, htons);
|
|
STRING_FIELD (result->s_proto, isspace, 1);
|
|
)
|
|
|
|
#include GENERIC
|
|
|
|
DB_LOOKUP (servbyname, ':',
|
|
strlen (name) + 2 + (proto == NULL ? 0 : strlen (proto)),
|
|
("%s/%s", name, proto ?: ""),
|
|
{
|
|
/* Must match both protocol (if specified) and name. */
|
|
if (proto != NULL && strcmp (result->s_proto, proto))
|
|
/* A continue statement here breaks nss_db, because it
|
|
bypasses advancing to the next db entry, and it
|
|
doesn't make nss_files any more efficient. */;
|
|
else
|
|
LOOKUP_NAME (s_name, s_aliases)
|
|
},
|
|
const char *name, const char *proto)
|
|
|
|
DB_LOOKUP (servbyport, '=', 21 + (proto ? strlen (proto) : 0),
|
|
("%zd/%s", (ssize_t) ntohs (port), proto ?: ""),
|
|
{
|
|
/* Must match both port and protocol. */
|
|
if (result->s_port == port
|
|
&& (proto == NULL
|
|
|| strcmp (result->s_proto, proto) == 0))
|
|
break;
|
|
}, int port, const char *proto)
|