-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
-#include <nss.h>
-#include <errno.h>
+#include <atomic.h>
#include <ctype.h>
+#include <errno.h>
#include <netdb.h>
+#include <nss.h>
#include <string.h>
-#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
-#include <rpcsvc/nislib.h>
+#include <libc-lock.h>
#include "nss-nisplus.h"
__libc_lock_define_initialized (static, lock);
-static nis_result *result = NULL;
-static nis_name *names = NULL;
-
-#define ENTNAME servent
-#define DATABASE "services"
-#define TRAILING_LIST_MEMBER s_aliases
-#define TRAILING_LIST_SEPARATOR_P isspace
-#include "../../nss/nss_files/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);
- )
+static nis_result *result;
+static nis_name tablename_val;
+static u_long tablename_len;
+#define NISENTRYVAL(idx, col, res) \
+ (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val)
-#define NISENTRYVAL(idx,col,res) \
- ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val)
+#define NISENTRYLEN(idx, col, res) \
+ (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
-#define NISENTRYLEN(idx,col,res) \
- ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
static int
_nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
- char *p = buffer;
+ char *first_unused = buffer;
size_t room_left = buflen;
- unsigned int i;
- struct parser_data *data = (void *) buffer;
if (result == NULL)
return 0;
- if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) ||
- result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ ||
- strcmp (result->objects.objects_val[0].zo_data.objdata_u.en_data.en_type,
- "services_tbl") != 0 ||
- result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
+ if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS)
+ || __type_of (NIS_RES_OBJECT (result)) != NIS_ENTRY_OBJ
+ || strcmp (NIS_RES_OBJECT (result)->EN_data.en_type, "services_tbl") != 0
+ || NIS_RES_OBJECT (result)->EN_data.en_cols.en_cols_len < 4)
return 0;
- memset (p, '\0', room_left);
-
- /* Generate the services entry format and use the normal parser */
- if (NISENTRYLEN (0, 0, result) + 1 > room_left)
+ if (NISENTRYLEN (0, 0, result) >= room_left)
{
- __set_errno (ERANGE);
- return 0;
+ no_more_room:
+ *errnop = ERANGE;
+ return -1;
}
- strncpy (p, NISENTRYVAL (0, 0, result), NISENTRYLEN (0, 0, result));
- room_left -= (NISENTRYLEN (0, 0, result) + 1);
-
- if (NISENTRYLEN (0, 3, result) + 1 > room_left)
+ strncpy (first_unused, NISENTRYVAL (0, 0, result),
+ NISENTRYLEN (0, 0, result));
+ first_unused[NISENTRYLEN (0, 0, result)] = '\0';
+ serv->s_name = first_unused;
+ size_t len = strlen (first_unused) + 1;
+ room_left -= len;
+ first_unused += len;
+
+ if (NISENTRYLEN (0, 2, result) >= room_left)
+ goto no_more_room;
+ strncpy (first_unused, NISENTRYVAL (0, 2, result),
+ NISENTRYLEN (0, 2, result));
+ first_unused[NISENTRYLEN (0, 2, result)] = '\0';
+ serv->s_proto = first_unused;
+ len = strlen (first_unused) + 1;
+ room_left -= len;
+ first_unused += len;
+
+ serv->s_port = htons (atoi (NISENTRYVAL (0, 3, result)));
+
+ /* XXX Rewrite at some point to allocate the array first and then
+ copy the strings. It wasteful to first concatenate the strings
+ to just split them again later. */
+ char *line = first_unused;
+ for (unsigned int i = 0; i < NIS_RES_NUMOBJ (result); ++i)
{
- __set_errno (ERANGE);
- return 0;
+ if (strcmp (NISENTRYVAL (i, 1, result), serv->s_name) != 0)
+ {
+ if (NISENTRYLEN (i, 1, result) + 2 > room_left)
+ goto no_more_room;
+ *first_unused++ = ' ';
+ first_unused = __stpncpy (first_unused, NISENTRYVAL (i, 1, result),
+ NISENTRYLEN (i, 1, result));
+ room_left -= NISENTRYLEN (i, 1, result) + 1;
+ }
}
- strcat (p, "\t");
- strncat (p, NISENTRYVAL (0, 3, result), NISENTRYLEN (0, 3, result));
- room_left -= (NISENTRYLEN (0, 3, result) + 1);
- if (NISENTRYLEN (0, 2, result) + 1 > room_left)
+ *first_unused++ = '\0';
+
+ /* Adjust the pointer so it is aligned for
+ storing pointers. */
+ size_t adjust = ((__alignof__ (char *)
+ - (first_unused - (char *) 0) % __alignof__ (char *))
+ % __alignof__ (char *));
+ if (room_left < adjust + sizeof (char *))
+ goto no_more_room;
+ first_unused += adjust;
+ room_left -= adjust;
+ serv->s_aliases = (char **) first_unused;
+
+ /* For the terminating NULL pointer. */
+ room_left -= (sizeof (char *));
+
+ unsigned int i = 0;
+ while (*line != '\0')
{
- __set_errno (ERANGE);
- return 0;
+ /* Skip leading blanks. */
+ while (isspace (*line))
+ ++line;
+
+ if (*line == '\0')
+ break;
+
+ if (room_left < sizeof (char *))
+ goto no_more_room;
+
+ room_left -= sizeof (char *);
+ serv->s_aliases[i++] = line;
+
+ while (*line != '\0' && *line != ' ')
+ ++line;
+
+ if (*line == ' ')
+ *line++ = '\0';
}
- strcat (p, "/");
- strncat (p, NISENTRYVAL (0, 2, result), NISENTRYLEN (0, 2, result));
- room_left -= (NISENTRYLEN (0, 2, result) + 1);
+ serv->s_aliases[i] = NULL;
- for (i = 1; i < result->objects.objects_len; i++)
+ return 1;
+}
+
+
+static enum nss_status
+_nss_create_tablename (int *errnop)
+{
+ if (tablename_val == NULL)
{
- if (NISENTRYLEN (i, 1, result) + 1 > room_left)
+ const char *local_dir = nis_local_directory ();
+ size_t local_dir_len = strlen (local_dir);
+ static const char prefix[] = "services.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+ if (p == NULL)
{
- __set_errno (ERANGE);
- return 0;
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
}
- strcat (p, " ");
- strcat (p, NISENTRYVAL (i, 1, result));
- room_left -= (NISENTRYLEN (i, 1, result) + 1);
+
+ memcpy (__stpcpy (p, prefix), local_dir, local_dir_len + 1);
+
+ tablename_len = sizeof (prefix) - 1 + local_dir_len;
+
+ atomic_write_barrier ();
+
+ tablename_val = p;
}
- return _nss_files_parse_servent (p, serv, data, buflen);
+ return NSS_STATUS_SUCCESS;
}
+
enum nss_status
-_nss_nisplus_setservent (void)
+_nss_nisplus_setservent (int stayopen)
{
+ enum nss_status status = NSS_STATUS_SUCCESS;
+ int err;
+
__libc_lock_lock (lock);
- if (result)
- nis_freeresult (result);
- result = NULL;
- if (names)
+ if (result != NULL)
{
- nis_freenames (names);
- names = NULL;
+ nis_freeresult (result);
+ result = NULL;
}
+ if (tablename_val == NULL)
+ status = _nss_create_tablename (&err);
+
__libc_lock_unlock (lock);
- return NSS_STATUS_SUCCESS;
+ return status;
}
enum nss_status
{
__libc_lock_lock (lock);
- if (result)
- nis_freeresult (result);
- result = NULL;
- if (names)
+ if (result != NULL)
{
- nis_freenames (names);
- names = NULL;
+ nis_freeresult (result);
+ result = NULL;
}
__libc_lock_unlock (lock);
static enum nss_status
internal_nisplus_getservent_r (struct servent *serv, char *buffer,
- size_t buflen)
+ size_t buflen, int *errnop)
{
int parse_res;
/* Get the next entry until we found a correct one. */
do
{
+ nis_result *saved_res;
+
if (result == NULL)
{
- names = nis_getnames ("services.org_dir");
- if (names == NULL || names[0] == NULL)
- return NSS_STATUS_UNAVAIL;
-
- result = nis_first_entry (names[0]);
+ saved_res = NULL;
+ if (tablename_val == NULL)
+ {
+ enum nss_status status = _nss_create_tablename (errnop);
+
+ if (status != NSS_STATUS_SUCCESS)
+ return status;
+ }
+
+ result = nis_first_entry (tablename_val);
+ if (result == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+ }
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
return niserr2nss (result->status);
}
else
{
- nis_result *res;
-
- res = nis_next_entry (names[0], &result->cookie);
- nis_freeresult (result);
- result = res;
+ saved_res = result;
+ result = nis_next_entry (tablename_val, &result->cookie);
+ if (result == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+ }
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
- return niserr2nss (result->status);
+ {
+ nis_freeresult (saved_res);
+ return niserr2nss (result->status);
+ }
}
- parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
+ parse_res = _nss_nisplus_parse_servent (result, serv, buffer,
+ buflen, errnop);
+ if (__glibc_unlikely (parse_res == -1))
+ {
+ nis_freeresult (result);
+ result = saved_res;
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ else
+ {
+ if (saved_res)
+ nis_freeresult (saved_res);
+ }
}
while (!parse_res);
enum nss_status
_nss_nisplus_getservent_r (struct servent *result, char *buffer,
- size_t buflen)
+ size_t buflen, int *errnop)
{
- int status;
-
__libc_lock_lock (lock);
- status = internal_nisplus_getservent_r (result, buffer, buflen);
+ int status = internal_nisplus_getservent_r (result, buffer, buflen, errnop);
__libc_lock_unlock (lock);
enum nss_status
_nss_nisplus_getservbyname_r (const char *name, const char *protocol,
struct servent *serv,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
- int parse_res;
+ if (tablename_val == NULL)
+ {
+ __libc_lock_lock (lock);
+
+ enum nss_status status = _nss_create_tablename (errnop);
+
+ __libc_lock_unlock (lock);
+
+ if (status != NSS_STATUS_SUCCESS)
+ return status;
+ }
if (name == NULL || protocol == NULL)
{
- __set_errno (EINVAL);
+ *errnop = EINVAL;
return NSS_STATUS_NOTFOUND;
}
- else
+
+ size_t protocol_len = strlen (protocol);
+ char buf[strlen (name) + protocol_len + 17 + tablename_len];
+ int olderr = errno;
+
+ /* Search at first in the alias list, and use the correct name
+ for the next search */
+ snprintf (buf, sizeof (buf), "[name=%s,proto=%s],%s", name, protocol,
+ tablename_val);
+ nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+ NULL, NULL);
+
+ if (result != NULL)
{
- nis_result *result;
- char buf[strlen (name) + 255];
-
- /* Search at first in the alias list, and use the correct name
- for the next search */
- sprintf (buf, "[name=%s,proto=%s],services.org_dir", name,
- protocol);
- result = nis_list (buf, EXPAND_NAME, NULL, NULL);
-
- /* If we do not find it, try it as original name. But if the
- database is correct, we should find it in the first case, too */
- if ((result->status != NIS_SUCCESS &&
- result->status != NIS_S_SUCCESS) ||
- result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ ||
- strcmp (result->objects.objects_val[0].zo_data.objdata_u.en_data.en_type,
- "services_tbl") != 0 ||
- result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
- sprintf (buf, "[cname=%s,proto=%s],services.org_dir", name, protocol);
+ char *bufptr = buf;
+
+ /* If we did not find it, try it as original name. But if the
+ database is correct, we should find it in the first case, too */
+ if ((result->status != NIS_SUCCESS
+ && result->status != NIS_S_SUCCESS)
+ || __type_of (NIS_RES_OBJECT (result)) != NIS_ENTRY_OBJ
+ || strcmp (NIS_RES_OBJECT (result)->EN_data.en_type,
+ "services_tbl") != 0
+ || NIS_RES_OBJECT (result)->EN_data.en_cols.en_cols_len < 4)
+ snprintf (buf, sizeof (buf), "[cname=%s,proto=%s],%s", name, protocol,
+ tablename_val);
else
- sprintf (buf, "[cname=%s,proto=%s],services.org_dir",
- NISENTRYVAL (0, 0, result), protocol);
+ {
+ /* We need to allocate a new buffer since there is no
+ guarantee the returned name has a length limit. */
+ const char *entryval = NISENTRYVAL(0, 0, result);
+ size_t buflen = (strlen (entryval) + protocol_len + 17
+ + tablename_len);
+ bufptr = alloca (buflen);
+ snprintf (bufptr, buflen, "[cname=%s,proto=%s],%s",
+ entryval, protocol, tablename_val);
+ }
nis_freeresult (result);
- result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+ result = nis_list (bufptr, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+ NULL, NULL);
+ }
- if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
- {
- enum nss_status status = niserr2nss (result->status);
+ if (result == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_TRYAGAIN;
+ }
- nis_freeresult (result);
- return status;
- }
+ if (__glibc_unlikely (niserr2nss (result->status) != NSS_STATUS_SUCCESS))
+ {
+ enum nss_status status = niserr2nss (result->status);
- parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
+ __set_errno (olderr);
nis_freeresult (result);
+ return status;
+ }
- if (parse_res)
- return NSS_STATUS_SUCCESS;
+ int parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen,
+ errnop);
+ nis_freeresult (result);
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
+ if (__glibc_unlikely (parse_res < 1))
+ {
+ if (parse_res == -1)
+ {
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
else
- return NSS_STATUS_NOTFOUND;
+ {
+ __set_errno (olderr);
+ return NSS_STATUS_NOTFOUND;
+ }
}
+
+ return NSS_STATUS_SUCCESS;
}
enum nss_status
-_nss_nisplus_getservbynumber_r (const int number, const char *protocol,
- struct servent *serv,
- char *buffer, size_t buflen)
+_nss_nisplus_getservbyport_r (const int number, const char *protocol,
+ struct servent *serv,
+ char *buffer, size_t buflen, int *errnop)
{
- int parse_res;
- nis_result *result;
- char buf[60 + strlen (protocol)];
+ if (tablename_val == NULL)
+ {
+ __libc_lock_lock (lock);
+
+ enum nss_status status = _nss_create_tablename (errnop);
+
+ __libc_lock_unlock (lock);
+
+ if (status != NSS_STATUS_SUCCESS)
+ return status;
+ }
if (protocol == NULL)
{
- __set_errno (EINVAL);
+ *errnop = EINVAL;
return NSS_STATUS_NOTFOUND;
}
- snprintf (buf, sizeof (buf), "[number=%d,proto=%s],services.org_dir",
- number, protocol);
+ char buf[17 + 3 * sizeof (int) + strlen (protocol) + tablename_len];
+ int olderr = errno;
+
+ snprintf (buf, sizeof (buf), "[port=%d,proto=%s],%s",
+ number, protocol, tablename_val);
- result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+ nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+ NULL, NULL);
- if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+ if (result == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_TRYAGAIN;
+ }
+
+ if (__glibc_unlikely (niserr2nss (result->status) != NSS_STATUS_SUCCESS))
{
enum nss_status status = niserr2nss (result->status);
+ __set_errno (olderr);
+
nis_freeresult (result);
return status;
}
- parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
-
+ int parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen,
+ errnop);
nis_freeresult (result);
- if (parse_res)
- return NSS_STATUS_SUCCESS;
+ if (__glibc_unlikely (parse_res < 1))
+ {
+ if (parse_res == -1)
+ {
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ else
+ {
+ __set_errno (olderr);
+ return NSS_STATUS_NOTFOUND;
+ }
+ }
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
+ return NSS_STATUS_SUCCESS;
}
projects / thirdparty / glibc.git / blobdiff