glibc/nis/nss_nisplus/nisplus-hosts.c
Ulrich Drepper 900bec852d Update.
1997-06-15 00:43  Ulrich Drepper  <drepper@cygnus.com>

	* Makeconfig: Define libc-map here.
	* Makefile: And remove definition here.
	* Makerules (load-map-file): Handle case where map file is in
	other directory.
	(build-shlib): Likewise.

	* libc.map: Add more symbols.
	* resolv/libresolv.map: Likewise.

	* db/libdb.map: Add __dbopen.  Patch by HJ Lu.

	* libio/stdio.h: Remove "optmizations" for vfscanf and vsscanf.

	* locale/programs/localedef.c: Add normalize_codeset function.  We
	don't want to use the _nl_normalize_codeset functions from libc.

	* sysdeps/libm-i387/s_asinh.S: Handle +-Inf and NaN correctly.
	* sysdeps/libm-i387/s_asinhf.S: Likewise.
	* sysdeps/libm-i387/s_asinhl.S: Likewise.
	* sysdeps/libm-i387/s_nearbyint.S: Correctly leave function.
	* sysdeps/libm-i387/s_nearbyintf.S: Likewise.
	* sysdeps/libm-i387/s_nearbyintl.S: Likewise.

1997-06-14 12:45  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/nss_nis/nis-ethers.c: Add static to internal_nis_setetherent.

	* nis/nss_nis/nis-proto.c: Add static to internal_nis_setprotoent.

	* nis/nss_nisplus/nisplus-hosts.c: Rewrite parser and fix
	_nss_nisplus_gethostbyaddr_r interface.

	* nis/libnsl.map: Add all GLOBAL functions.

1997-06-13 18:32  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libm-test.c 	(main): Call new tests, reorder tests.
	(fmod_test): Test function fmod.
	(nearbyint_test): Test function nearbyint.
	(acos_test): Add more test cases.
	(signbit_test): Test macro signbit.
	(output_result_bool): Output result if test fails.
	(asin_test): Add another test case.
	(atan2_test): Add more tests.
	(asinh_test): Add more tests.
	(atanh_test): Add more tests.
	(hypot_test): Add more tests.
	(isfinite_test): Test macro isfinite.
	(isnormal_test): Test macro isnormal.
	(sincos_test): Tests for sincos.
	(main): Enable remquo_test since the tests are
	correct (according to ANSI/IEEE 754-1985).
	(remquo_test): Corrected tests cases and added more tests.
	(remainder_test): Tests for remainder.
	(check_int): New Function to compare int values.
	(check_isnan_exc_ext): New function.
	(sqrt_test): Add some extra tests for sqrt.
	(erf_test): Tests for erf.
	(erfc_test): Tests for erfc.
	(gamma_test): Tests for gamma.
	(lgamma_test): Tests for lgamma.

1997-06-08 10:54  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* sysdeps/unix/sysv/linux/configure.in: Try to generate
	stdio_lim.h using the target C preprocessor and mk-stdiolim.c.
	* sysdeps/unix/sysv/linux/stdio_lim.h.in: New, template for
	stdio_lim.h.
	* sysdeps/unix/sysv/linux/mk-stdiolim.c: New, used by the
	target C preprocessor to extract OPEN_MAX and PATH_MAX.

1997-06-14 17:32  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm.map: Add inline functions, global variables.
1997-06-14 23:17:05 +00:00

427 lines
11 KiB
C

/* Copyright (C) 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.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.
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.
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. */
#include <nss.h>
#include <netdb.h>
#include <errno.h>
#include <ctype.h>
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
#include "nss-nisplus.h"
__libc_lock_define_initialized (static, lock)
static nis_result *result = NULL;
static nis_name *names = NULL;
#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) \
((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
/* Get implementation for some internal functions. */
#include "../../resolv/mapv4v6addr.h"
static int
_nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host,
char *buffer, size_t buflen)
{
unsigned int i;
char *first_unused = buffer;
size_t room_left = buflen;
char *data, *p, *line;
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,
"hosts_tbl") != 0 ||
result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
return 0;
if (room_left < NISENTRYLEN (0, 2, result) + 1)
{
__set_errno (ERANGE);
return 0;
}
data = first_unused;
if (inet_pton (af, NISENTRYVAL (0, 2, result), data) < 1)
/* Illegal address: ignore line. */
return 0;
host->h_addrtype = af;
if (af == AF_INET6)
host->h_length = IN6ADDRSZ;
else
{
if (_res.options & RES_USE_INET6)
{
map_v4v6_address (data, data);
host->h_addrtype = AF_INET6;
host->h_length = IN6ADDRSZ;
}
else
{
host->h_addrtype = AF_INET;
host->h_length = INADDRSZ;
}
}
first_unused+=host->h_length;
room_left-=host->h_length;
if (NISENTRYLEN (0, 0, result) + 1 > room_left)
{
__set_errno (ERANGE);
return 0;
}
p = stpncpy (first_unused, NISENTRYVAL (0, 0, result),
NISENTRYLEN (0, 0, result));
*p = '\0';
room_left -= (NISENTRYLEN (0, 0, result) + 1);
host->h_name = first_unused;
first_unused += NISENTRYLEN (0, 0, result) +1;
p = first_unused;
line = p;
for (i = 0; i < result->objects.objects_len; i++)
{
if (strcmp (NISENTRYVAL (i, 1, result), host->h_name) != 0)
{
if (NISENTRYLEN (i, 1, result) + 2 > room_left)
{
__set_errno (ERANGE);
return 0;
}
p = stpcpy(p, " ");
p = stpncpy (p, NISENTRYVAL (i, 1, result),
NISENTRYLEN (i, 1, result));
*p = '\0';
room_left -= (NISENTRYLEN (i, 1, result) + 1);
}
}
++p;
first_unused = p;
/* Adjust the pointer so it is aligned for
storing pointers. */
first_unused += __alignof__ (char *) - 1;
first_unused -= ((first_unused - (char *) 0) % __alignof__ (char *));
host->h_addr_list = (char **) first_unused;
if (room_left < 2 * sizeof (char *))
{
__set_errno (ERANGE);
return 0;
}
room_left -= (2 * sizeof (char *));
host->h_addr_list[0] = data;
host->h_addr_list[1] = NULL;
host->h_aliases = &host->h_addr_list[2];
host->h_aliases[0] = NULL;
i = 0;
while (*line != '\0')
{
/* Skip leading blanks. */
while (isspace (*line))
line++;
if (*line == '\0')
break;
if (room_left < sizeof (char *))
{
__set_errno (ERANGE);
return 0;
}
room_left -= sizeof (char *);
host->h_aliases[i] = line;
while (*line != '\0' && *line != ' ')
line++;
if (line != host->h_aliases[i])
{
*line = '\0';
line++;
i++;
}
}
return 1;
}
enum nss_status
_nss_nisplus_sethostent (void)
{
__libc_lock_lock (lock);
if (result)
nis_freeresult (result);
result = NULL;
if (names)
{
nis_freenames (names);
names = NULL;
}
__libc_lock_unlock (lock);
return NSS_STATUS_SUCCESS;
}
enum nss_status
_nss_nisplus_endhostent (void)
{
__libc_lock_lock (lock);
if (result)
nis_freeresult (result);
result = NULL;
if (names)
{
nis_freenames (names);
names = NULL;
}
__libc_lock_unlock (lock);
return NSS_STATUS_SUCCESS;
}
static enum nss_status
internal_nisplus_gethostent_r (struct hostent *host, char *buffer,
size_t buflen, int *herrnop)
{
int parse_res;
/* Get the next entry until we found a correct one. */
do
{
if (result == NULL)
{
names = nis_getnames("hosts.org_dir");
if (names == NULL || names[0] == NULL)
return NSS_STATUS_UNAVAIL;
result = nis_first_entry(names[0]);
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
int retval;
retval = niserr2nss (result->status);
if (retval == NSS_STATUS_TRYAGAIN)
{
*herrnop = NETDB_INTERNAL;
__set_errno (EAGAIN);
}
return retval;
}
}
else
{
nis_result *res2;
res2 = nis_next_entry(names[0], &result->cookie);
nis_freeresult (result);
result = res2;
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
int retval;
retval = niserr2nss (result->status);
if (retval == NSS_STATUS_TRYAGAIN)
{
*herrnop = NETDB_INTERNAL;
__set_errno (EAGAIN);
}
return retval;
}
}
parse_res = _nss_nisplus_parse_hostent (result, AF_INET6,
host, buffer, buflen);
if (!parse_res && errno != ERANGE)
parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host,
buffer, buflen);
if (!parse_res && errno == ERANGE)
{
*herrnop = NETDB_INTERNAL;
return NSS_STATUS_TRYAGAIN;
}
} while (!parse_res);
return NSS_STATUS_SUCCESS;
}
enum nss_status
_nss_nisplus_gethostent_r (struct hostent *result, char *buffer,
size_t buflen, int *herrnop)
{
int status;
__libc_lock_lock (lock);
status = internal_nisplus_gethostent_r (result, buffer, buflen, herrnop);
__libc_lock_unlock (lock);
return status;
}
enum nss_status
_nss_nisplus_gethostbyname2_r (const char *name, int af, struct hostent *host,
char *buffer, size_t buflen, int *herrnop)
{
int parse_res, retval;
if (name == NULL)
{
__set_errno (EINVAL);
*herrnop = NETDB_INTERNAL;
return NSS_STATUS_NOTFOUND;
}
else
{
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],hosts.org_dir", name);
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,
"hosts_tbl") != 0 ||
result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len
< 3)
sprintf(buf, "[cname=%s],hosts.org_dir", name);
else
sprintf(buf, "[cname=%s],hosts.org_dir", NISENTRYVAL(0, 0, result));
nis_freeresult (result);
result = nis_list(buf, EXPAND_NAME, NULL, NULL);
retval = niserr2nss (result->status);
if (retval != NSS_STATUS_SUCCESS)
{
if (retval == NSS_STATUS_TRYAGAIN)
{
__set_errno (EAGAIN);
*herrnop = NETDB_INTERNAL;
}
nis_freeresult (result);
return retval;
}
parse_res =
_nss_nisplus_parse_hostent (result, af, host, buffer, buflen);
nis_freeresult (result);
if (parse_res)
return NSS_STATUS_SUCCESS;
*herrnop = NETDB_INTERNAL;
if (!parse_res && errno == ERANGE)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
}
}
enum nss_status
_nss_nisplus_gethostbyname_r (const char *name, struct hostent *host,
char *buffer, size_t buflen, int *h_errnop)
{
if (_res.options & RES_USE_INET6)
{
enum nss_status status;
status = _nss_nisplus_gethostbyname2_r (name, AF_INET6, host, buffer,
buflen, h_errnop);
if (status == NSS_STATUS_SUCCESS)
return status;
}
return _nss_nisplus_gethostbyname2_r (name, AF_INET, host, buffer,
buflen, h_errnop);
}
enum nss_status
_nss_nisplus_gethostbyaddr_r (const char *addr, int addrlen, int type,
struct hostent *host, char *buffer,
size_t buflen, int *herrnop)
{
if (addr == NULL)
return NSS_STATUS_NOTFOUND;
else
{
nis_result *result;
char buf[1025];
int retval, parse_res;
snprintf(buf, sizeof (buf) -1, "[addr=%s],hosts.org_dir",
inet_ntoa (*(struct in_addr *)addr));
result = nis_list(buf, EXPAND_NAME, NULL, NULL);
retval = niserr2nss (result->status);
if (retval != NSS_STATUS_SUCCESS)
{
if (retval == NSS_STATUS_TRYAGAIN)
{
__set_errno (EAGAIN);
*herrnop = NETDB_INTERNAL;
}
nis_freeresult (result);
return retval;
}
parse_res = _nss_nisplus_parse_hostent (result, type, host,
buffer, buflen);
nis_freeresult (result);
if (parse_res)
return NSS_STATUS_SUCCESS;
*herrnop = NETDB_INTERNAL;
if (!parse_res && errno == ERANGE)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
}
}