aboutsummaryrefslogtreecommitdiff
path: root/nis/nss_nisplus/nisplus-service.c
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_nisplus/nisplus-service.c')
-rw-r--r--nis/nss_nisplus/nisplus-service.c341
1 files changed, 153 insertions, 188 deletions
diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c
index 607ce80b01..fbb6987e9e 100644
--- a/nis/nss_nisplus/nisplus-service.c
+++ b/nis/nss_nisplus/nisplus-service.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2006, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
@@ -18,14 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <atomic.h>
-#include <ctype.h>
+#include <nss.h>
#include <errno.h>
+#include <ctype.h>
#include <netdb.h>
-#include <nss.h>
#include <string.h>
-#include <rpcsvc/nis.h>
#include <bits/libc-lock.h>
+#include <rpcsvc/nis.h>
#include "nss-nisplus.h"
@@ -35,12 +33,11 @@ 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 NISENTRYLEN(idx, col, res) \
- (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
+#define NISENTRYVAL(idx,col,res) \
+ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val)
+#define NISENTRYLEN(idx,col,res) \
+ ((res)->objects.objects_val[(idx)].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,
@@ -48,14 +45,17 @@ _nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
{
char *first_unused = buffer;
size_t room_left = buflen;
+ unsigned int i;
+ char *p, *line;
if (result == NULL)
return 0;
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)
+ || __type_of (result->objects.objects_val) != NIS_ENTRY_OBJ
+ || strcmp (result->objects.objects_val->EN_data.en_type,
+ "services_tbl") != 0
+ || result->objects.objects_val->EN_data.en_cols.en_cols_len < 4)
return 0;
if (NISENTRYLEN (0, 0, result) >= room_left)
@@ -68,9 +68,8 @@ _nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
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;
+ room_left -= (strlen (first_unused) +1);
+ first_unused += strlen (first_unused) +1;
if (NISENTRYLEN (0, 2, result) >= room_left)
goto no_more_room;
@@ -78,45 +77,40 @@ _nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
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;
+ room_left -= strlen (first_unused) + 1;
+ first_unused += strlen (first_unused) + 1;
serv->s_port = htons (atoi (NISENTRYVAL (0, 3, result)));
+ p = first_unused;
- /* 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)
+ line = p;
+ for (i = 0; i < result->objects.objects_len; ++i)
{
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;
+ *p++ = ' ';
+ p = __stpncpy (p, NISENTRYVAL (i, 1, result),
+ NISENTRYLEN (i, 1, result));
+ *p = '\0';
+ room_left -= (NISENTRYLEN (i, 1, result) + 1);
}
}
- *first_unused++ = '\0';
+ *p++ = '\0';
+ first_unused = p;
/* 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;
+ first_unused += __alignof__ (char *) - 1;
+ first_unused -= ((first_unused - (char *) 0) % __alignof__ (char *));
serv->s_aliases = (char **) first_unused;
-
- /* For the terminating NULL pointer. */
+ if (room_left < sizeof (char *))
+ goto no_more_room;
room_left -= (sizeof (char *));
+ serv->s_aliases[0] = NULL;
- unsigned int i = 0;
+ i = 0;
while (*line != '\0')
{
/* Skip leading blanks. */
@@ -130,45 +124,42 @@ _nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
goto no_more_room;
room_left -= sizeof (char *);
- serv->s_aliases[i++] = line;
+ serv->s_aliases[i] = line;
while (*line != '\0' && *line != ' ')
++line;
if (*line == ' ')
- *line++ = '\0';
+ {
+ *line = '\0';
+ ++line;
+ ++i;
+ }
+ else
+ serv->s_aliases[i+1] = NULL;
}
- serv->s_aliases[i] = NULL;
return 1;
}
-
static enum nss_status
_nss_create_tablename (int *errnop)
{
if (tablename_val == NULL)
{
- const char *local_dir = nis_local_directory ();
- size_t local_dir_len = strlen (local_dir);
- static const char prefix[] = "services.org_dir.";
+ char buf [40 + strlen (nis_local_directory ())];
+ char *p;
- char *p = malloc (sizeof (prefix) + local_dir_len);
- if (p == NULL)
+ p = __stpcpy (buf, "services.org_dir.");
+ p = __stpcpy (p, nis_local_directory ());
+ tablename_val = __strdup (buf);
+ if (tablename_val == NULL)
{
*errnop = errno;
return NSS_STATUS_TRYAGAIN;
}
-
- memcpy (__stpcpy (p, prefix), local_dir, local_dir_len + 1);
-
- tablename_len = sizeof (prefix) - 1 + local_dir_len;
-
- atomic_write_barrier ();
-
- tablename_val = p;
+ tablename_len = strlen (tablename_val);
}
-
return NSS_STATUS_SUCCESS;
}
@@ -181,11 +172,9 @@ _nss_nisplus_setservent (int stayopen)
__libc_lock_lock (lock);
- if (result != NULL)
- {
- nis_freeresult (result);
- result = NULL;
- }
+ if (result)
+ nis_freeresult (result);
+ result = NULL;
if (tablename_val == NULL)
status = _nss_create_tablename (&err);
@@ -200,11 +189,9 @@ _nss_nisplus_endservent (void)
{
__libc_lock_lock (lock);
- if (result != NULL)
- {
- nis_freeresult (result);
- result = NULL;
- }
+ if (result)
+ nis_freeresult (result);
+ result = NULL;
__libc_lock_unlock (lock);
@@ -234,23 +221,16 @@ internal_nisplus_getservent_r (struct servent *serv, char *buffer,
}
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;
+
saved_res = result;
- result = nis_next_entry (tablename_val, &result->cookie);
- if (result == NULL)
- {
- *errnop = errno;
- return NSS_STATUS_TRYAGAIN;
- }
+ res = nis_next_entry (tablename_val, &result->cookie);
+ result = res;
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
nis_freeresult (saved_res);
@@ -260,7 +240,7 @@ internal_nisplus_getservent_r (struct servent *serv, char *buffer,
parse_res = _nss_nisplus_parse_servent (result, serv, buffer,
buflen, errnop);
- if (__builtin_expect (parse_res == -1, 0))
+ if (parse_res == -1)
{
nis_freeresult (result);
result = saved_res;
@@ -282,9 +262,11 @@ enum nss_status
_nss_nisplus_getservent_r (struct servent *result, char *buffer,
size_t buflen, int *errnop)
{
+ int status;
+
__libc_lock_lock (lock);
- int status = internal_nisplus_getservent_r (result, buffer, buflen, errnop);
+ status = internal_nisplus_getservent_r (result, buffer, buflen, errnop);
__libc_lock_unlock (lock);
@@ -296,14 +278,12 @@ _nss_nisplus_getservbyname_r (const char *name, const char *protocol,
struct servent *serv,
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;
}
@@ -313,84 +293,72 @@ _nss_nisplus_getservbyname_r (const char *name, const char *protocol,
*errnop = EINVAL;
return NSS_STATUS_NOTFOUND;
}
+ else
+ {
+ nis_result *result;
+ char buf[strlen (name) + 255 + tablename_len];
+ int olderr = errno;
- 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);
+ /* Search at first in the alias list, and use the correct name
+ for the next search */
+ sprintf (buf, "[name=%s,proto=%s],%s", name, protocol,
+ tablename_val);
+ result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
- if (result != NULL)
- {
- 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
+ if (result != NULL)
{
- /* 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);
- }
+ /* 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)
+ || __type_of (result->objects.objects_val) != NIS_ENTRY_OBJ
+ || strcmp (result->objects.objects_val->EN_data.en_type,
+ "services_tbl") != 0
+ || result->objects.objects_val->EN_data.en_cols.en_cols_len < 4)
+ sprintf (buf, "[cname=%s,proto=%s],%s", name, protocol,
+ tablename_val);
+ else
+ sprintf (buf, "[cname=%s,proto=%s],%s",
+ NISENTRYVAL (0, 0, result), protocol, tablename_val);
- nis_freeresult (result);
- result = nis_list (bufptr, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
- NULL, NULL);
- }
-
- if (result == NULL)
- {
- *errnop = ENOMEM;
- return NSS_STATUS_TRYAGAIN;
- }
+ nis_freeresult (result);
+ result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+ }
- if (__builtin_expect (niserr2nss (result->status) != NSS_STATUS_SUCCESS, 0))
- {
- enum nss_status status = niserr2nss (result->status);
+ if (result == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+ {
+ enum nss_status status = niserr2nss (result->status);
- __set_errno (olderr);
+ __set_errno (olderr);
- nis_freeresult (result);
- return status;
- }
+ nis_freeresult (result);
+ return status;
+ }
- int parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen,
+ parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen,
errnop);
- nis_freeresult (result);
+ nis_freeresult (result);
- if (__builtin_expect (parse_res < 1, 0))
- {
- if (parse_res == -1)
+ if (parse_res < 1)
{
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- else
- {
- __set_errno (olderr);
- return NSS_STATUS_NOTFOUND;
+ if (parse_res == -1)
+ {
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ else
+ {
+ __set_errno (olderr);
+ return NSS_STATUS_NOTFOUND;
+ }
}
+ return NSS_STATUS_SUCCESS;
}
-
- return NSS_STATUS_SUCCESS;
}
enum nss_status
@@ -400,12 +368,8 @@ _nss_nisplus_getservbyport_r (const int number, const char *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;
}
@@ -415,49 +379,50 @@ _nss_nisplus_getservbyport_r (const int number, const char *protocol,
*errnop = EINVAL;
return NSS_STATUS_NOTFOUND;
}
-
- 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);
-
- nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
- NULL, NULL);
-
- if (result == NULL)
- {
- *errnop = ENOMEM;
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (__builtin_expect (niserr2nss (result->status) != NSS_STATUS_SUCCESS, 0))
+ else
{
- enum nss_status status = niserr2nss (result->status);
+ int parse_res;
+ nis_result *result;
+ char buf[60 + strlen (protocol) + tablename_len];
+ int olderr = errno;
- __set_errno (olderr);
+ sprintf (buf, "[port=%d,proto=%s],%s",
+ number, protocol, tablename_val);
- nis_freeresult (result);
- return status;
- }
-
- int parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen,
- errnop);
- nis_freeresult (result);
+ result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
- if (__builtin_expect (parse_res < 1, 0))
- {
- if (parse_res == -1)
+ if (result == NULL)
{
- *errnop = ERANGE;
+ *errnop = ENOMEM;
return NSS_STATUS_TRYAGAIN;
}
- else
+ if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
+ enum nss_status status = niserr2nss (result->status);
+
__set_errno (olderr);
- return NSS_STATUS_NOTFOUND;
+
+ nis_freeresult (result);
+ return status;
}
- }
- return NSS_STATUS_SUCCESS;
+ parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen,
+ errnop);
+ nis_freeresult (result);
+
+ if (parse_res < 1)
+ {
+ if (parse_res == -1)
+ {
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ else
+ {
+ __set_errno (olderr);
+ return NSS_STATUS_NOTFOUND;
+ }
+ }
+ return NSS_STATUS_SUCCESS;
+ }
}