aboutsummaryrefslogtreecommitdiff
path: root/nis/nss_nisplus/nisplus-network.c
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_nisplus/nisplus-network.c')
-rw-r--r--nis/nss_nisplus/nisplus-network.c318
1 files changed, 144 insertions, 174 deletions
diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c
index 1cf652f071..422b02b82a 100644
--- a/nis/nss_nisplus/nisplus-network.c
+++ b/nis/nss_nisplus/nisplus-network.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1997,1998,2000-2003,2005,2006,2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2000,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@@ -18,16 +17,15 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <atomic.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
#include <nss.h>
+#include <netdb.h>
+#include <errno.h>
+#include <ctype.h>
#include <stdint.h>
#include <string.h>
#include <arpa/inet.h>
-#include <rpcsvc/nis.h>
#include <bits/libc-lock.h>
+#include <rpcsvc/nis.h>
#include "nss-nisplus.h"
@@ -37,31 +35,33 @@ 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)].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)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
static int
_nss_nisplus_parse_netent (nis_result *result, struct netent *network,
- char *buffer, size_t buflen, int *errnop)
+ char *buffer, size_t buflen, int *errnop)
{
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)[0].EN_data.en_type,
+ || __type_of (result->objects.objects_val) != NIS_ENTRY_OBJ
+ || strcmp (result->objects.objects_val[0].EN_data.en_type,
"networks_tbl") != 0
- || NIS_RES_OBJECT (result)[0].EN_data.en_cols.en_cols_len < 3)
+ || result->objects.objects_val[0].EN_data.en_cols.en_cols_len < 3)
return 0;
- if (NISENTRYLEN (0, 0, result) >= room_left)
+ if (NISENTRYLEN(0, 0, result) >= room_left)
{
/* The line is too long for our buffer. */
no_more_room:
@@ -69,56 +69,50 @@ _nss_nisplus_parse_netent (nis_result *result, struct netent *network,
return -1;
}
- strncpy (first_unused, NISENTRYVAL (0, 0, result),
+ strncpy (first_unused, NISENTRYVAL(0, 0, result),
NISENTRYLEN (0, 0, result));
first_unused[NISENTRYLEN (0, 0, result)] = '\0';
network->n_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;
network->n_addrtype = 0;
network->n_net = inet_network (NISENTRYVAL (0, 2, 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), network->n_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));
+ *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 *));
network->n_aliases = (char **) first_unused;
+ if (room_left < 2 * sizeof (char *))
+ goto no_more_room;
+ room_left -= (2 * sizeof (char *));
+ network->n_aliases[0] = NULL;
- /* For the terminating NULL pointer. */
- room_left -= sizeof (char *);
-
- unsigned int i = 0;
+ i = 0;
while (*line != '\0')
{
/* Skip leading blanks. */
while (isspace (*line))
- ++line;
+ line++;
if (*line == '\0')
break;
@@ -127,45 +121,42 @@ _nss_nisplus_parse_netent (nis_result *result, struct netent *network,
goto no_more_room;
room_left -= sizeof (char *);
- network->n_aliases[i++] = line;
+ network->n_aliases[i] = line;
while (*line != '\0' && *line != ' ')
++line;
if (*line == ' ')
- *line++ = '\0';
+ {
+ *line = '\0';
+ ++line;
+ ++i;
+ }
+ else
+ network->n_aliases[i+1] = NULL;
}
- network->n_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[] = "networks.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, "networks.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;
}
@@ -173,20 +164,16 @@ enum nss_status
_nss_nisplus_setnetent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
+ int err;
__libc_lock_lock (lock);
- if (result != NULL)
- {
- nis_freeresult (result);
- result = NULL;
- }
+ if (result)
+ nis_freeresult (result);
+ result = NULL;
if (tablename_val == NULL)
- {
- int err;
- status = _nss_create_tablename (&err);
- }
+ status = _nss_create_tablename (&err);
__libc_lock_unlock (lock);
@@ -198,11 +185,9 @@ _nss_nisplus_endnetent (void)
{
__libc_lock_lock (lock);
- if (result != NULL)
- {
- nis_freeresult (result);
- result = NULL;
- }
+ if (result)
+ nis_freeresult (result);
+ result = NULL;
__libc_lock_unlock (lock);
@@ -233,14 +218,11 @@ internal_nisplus_getnetent_r (struct netent *network, char *buffer,
}
result = nis_first_entry (tablename_val);
- if (result == NULL)
- {
- *errnop = errno;
- return NSS_STATUS_TRYAGAIN;
- }
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
- int retval = niserr2nss (result->status);
+ int retval;
+
+ retval = niserr2nss (result->status);
nis_freeresult (result);
result = NULL;
if (retval == NSS_STATUS_TRYAGAIN)
@@ -255,16 +237,16 @@ internal_nisplus_getnetent_r (struct netent *network, char *buffer,
}
else
{
+ nis_result *res;
+
+ res = nis_next_entry (tablename_val, &result->cookie);
saved_res = result;
- result = nis_next_entry (tablename_val, &result->cookie);
- if (result == NULL)
- {
- *errnop = errno;
- return NSS_STATUS_TRYAGAIN;
- }
+ result = res;
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
- int retval = niserr2nss (result->status);
+ int retval;
+
+ retval = niserr2nss (result->status);
nis_freeresult (result);
result = saved_res;
if (retval == NSS_STATUS_TRYAGAIN)
@@ -284,8 +266,7 @@ internal_nisplus_getnetent_r (struct netent *network, char *buffer,
return NSS_STATUS_TRYAGAIN;
}
- }
- while (!parse_res);
+ } while (!parse_res);
return NSS_STATUS_SUCCESS;
}
@@ -315,12 +296,8 @@ _nss_nisplus_getnetbyname_r (const char *name, struct netent *network,
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;
}
@@ -331,83 +308,76 @@ _nss_nisplus_getnetbyname_r (const char *name, struct netent *network,
*herrnop = NETDB_INTERNAL;
return NSS_STATUS_UNAVAIL;
}
+ else
+ {
+ nis_result *result;
+ char buf[strlen (name) + 255 + tablename_len];
+ int olderr = errno;
- nis_result *result;
- char buf[strlen (name) + 10 + tablename_len];
- int olderr = errno;
+ /* Search at first in the alias list, and use the correct name
+ for the next search */
+ sprintf (buf, "[name=%s],%s", name, tablename_val);
+ result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
- /* Search at first in the alias list, and use the correct name
- for the next search */
- snprintf (buf, sizeof (buf), "[name=%s],%s", name, tablename_val);
- result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH | USE_DGRAM, NULL, NULL);
+ if (result != 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)
+ || __type_of (result->objects.objects_val) != NIS_ENTRY_OBJ
+ || strcmp (result->objects.objects_val[0].EN_data.en_type,
+ "networks_tbl") != 0
+ || (result->objects.objects_val[0].EN_data.en_cols.en_cols_len
+ < 3))
+ sprintf (buf, "[cname=%s],%s", name, tablename_val);
+ else
+ sprintf (buf, "[cname=%s],%s", NISENTRYVAL (0, 0, result),
+ tablename_val);
+
+ nis_freeresult (result);
+ result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
+ }
- if (result != NULL)
- {
- char *bufptr = buf;
-
- /* 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[0].EN_data.en_type,
- "networks_tbl") != 0
- || (result->objects.objects_val[0].EN_data.en_cols.en_cols_len
- < 3))
- snprintf (buf, sizeof (buf), "[cname=%s],%s", name, tablename_val);
- else
+ if (result == NULL)
+ {
+ __set_errno (ENOMEM);
+ return NSS_STATUS_TRYAGAIN;
+ }
+ retval = niserr2nss (result->status);
+ if (retval != NSS_STATUS_SUCCESS)
{
- /* 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) + 10 + tablename_len;
- bufptr = alloca (buflen);
- snprintf (bufptr, buflen, "[cname=%s],%s",
- entryval, tablename_val);
+ if (retval == NSS_STATUS_TRYAGAIN)
+ {
+ *errnop = errno;
+ *herrnop = NETDB_INTERNAL;
+ }
+ else
+ __set_errno (olderr);
+ nis_freeresult (result);
+ return retval;
}
+ parse_res = _nss_nisplus_parse_netent (result, network, buffer, buflen,
+ errnop);
+
nis_freeresult (result);
- result = nis_list (bufptr, FOLLOW_LINKS | FOLLOW_PATH | USE_DGRAM,
- NULL, NULL);
- }
- if (result == NULL)
- {
- __set_errno (ENOMEM);
- return NSS_STATUS_TRYAGAIN;
- }
+ if (parse_res > 0)
+ return NSS_STATUS_SUCCESS;
- retval = niserr2nss (result->status);
- if (__builtin_expect (retval != NSS_STATUS_SUCCESS, 0))
- {
- if (retval == NSS_STATUS_TRYAGAIN)
+ *herrnop = NETDB_INTERNAL;
+ if (parse_res == -1)
{
- *errnop = errno;
- *herrnop = NETDB_INTERNAL;
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
else
- __set_errno (olderr);
- nis_freeresult (result);
- return retval;
- }
-
- parse_res = _nss_nisplus_parse_netent (result, network, buffer, buflen,
- errnop);
-
- nis_freeresult (result);
-
- if (parse_res > 0)
- return NSS_STATUS_SUCCESS;
-
- *herrnop = NETDB_INTERNAL;
- if (parse_res == -1)
- {
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
+ {
+ __set_errno (olderr);
+ return NSS_STATUS_NOTFOUND;
+ }
}
-
- __set_errno (olderr);
- return NSS_STATUS_NOTFOUND;
}
/* XXX type is ignored, SUN's NIS+ table doesn't support it */
@@ -418,48 +388,48 @@ _nss_nisplus_getnetbyaddr_r (uint32_t addr, const int type,
{
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;
}
{
- char buf[27 + tablename_len];
- char buf2[18];
+ int parse_res, retval;
+ nis_result *result;
+ char buf[1024 + tablename_len];
+ struct in_addr in;
+ char buf2[256];
+ int b2len;
int olderr = errno;
- struct in_addr in = inet_makeaddr (addr, 0);
+ in = inet_makeaddr (addr, 0);
strcpy (buf2, inet_ntoa (in));
- size_t b2len = strlen (buf2);
+ b2len = strlen (buf2);
while (1)
{
- snprintf (buf, sizeof (buf), "[addr=%s],%s", buf2, tablename_val);
- nis_result *result = nis_list (buf, EXPAND_NAME | USE_DGRAM,
- NULL, NULL);
+ sprintf (buf, "[addr=%s],%s", buf2, tablename_val);
+ result = nis_list (buf, EXPAND_NAME, NULL, NULL);
if (result == NULL)
{
__set_errno (ENOMEM);
return NSS_STATUS_TRYAGAIN;
}
- enum nss_status retval = niserr2nss (result->status);
- if (__builtin_expect (retval != NSS_STATUS_SUCCESS, 0))
+ retval = niserr2nss (result->status);
+ if (retval != NSS_STATUS_SUCCESS)
{
- if (b2len > 2 && buf2[b2len - 2] == '.' && buf2[b2len - 1] == '0')
+ if (buf2[b2len -2] == '.' && buf2[b2len -1] == '0')
{
/* Try again, but with trailing dot(s)
removed (one by one) */
buf2[b2len - 2] = '\0';
b2len -= 2;
- nis_freeresult (result);
continue;
}
+ else
+ return NSS_STATUS_NOTFOUND;
if (retval == NSS_STATUS_TRYAGAIN)
{
@@ -472,8 +442,8 @@ _nss_nisplus_getnetbyaddr_r (uint32_t addr, const int type,
return retval;
}
- int parse_res = _nss_nisplus_parse_netent (result, network, buffer,
- buflen, errnop);
+ parse_res = _nss_nisplus_parse_netent (result, network, buffer,
+ buflen, errnop);
nis_freeresult (result);