mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 11:30:06 +00:00
2d7da676f3
1997-07-11 03:00 Ulrich Drepper <drepper@cygnus.com> * inet/inet_ntoa.c: Prevent looking for thread data key if we found one. * signal/sigandset.c: Include stddef.h to get NULL defined. * signal/sigisempty.c: Likewise. * signal/sigorset.c: Likewise. * sysdeps/stub/if_index.h: Likewise. * wcsmbs/wcstod_l.c: Include locale.h to get __locale_t defined. * wcsmbs/wcstof_l.c: Likewise. * wcsmbs/wcstol_l.c: Likewise. * wcsmbs/wcstold_l.c: Likewise. * wcsmbs/wcstoll_l.c: Likewise. * wcsmbs/wcstoul_l.c: Likewise. * wcsmbs/wcstoull_l.c: Likewise. Reported by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>. * stdio-common/snprintf.c: Use ISO C function definition form. * sysdeps/stub/libc-lock.h: Don't define __libc_key_create and __libc_setspecific as empty macros since they are used as function with return value. Reported by Andreas Jaeger. 1997-07-10 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu> * sysdeps/mach/hurd/select.c (__select): Need bit count for MACH_MSG_TYPE_INTEGER_T. 1997-07-08 10:12 Fila Kolodny <fila@ibi.com> * sysdeps/i370/Implies: New file for i370-ibm-mvs port. * sysdeps/mvs/Implies: Likewise. 1997-07-09 23:06 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/Makefile: Add new source files. * nis/nis_intern.h: Add new internal functions. * nis/rpcsvc/nislib.h: Likewise. * nis/lckcache.c: New. * nis/nis_cache.c: New, dummy functions in the moment. * nis/nis_util.c: New. * nis/nisplus-parser.h: New. * nis/nss_nisplus/nisplus-parser.c: New. * nis/rpcsvc/nis_cache.h: New. * nis/rpcsvc/nis_cache.x: New. * nis/nss_compat/compat-grp.c: Matches Solaris behaviour now. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/nss_nis/nis-publickey.c: Remove libc-lock.h include. * nis/nis_intern.c: Removed. * nis/nis_call.c: Complete rewrite. * nis/nis_lookup.c: Likewise. * nis/nis_table.c: Likewise. * nis/libnsl.map: Add missing symbols. * nis/nis_print.c: Fix nis_print_link. * nis/nis_subr.c: Fix nis_getnames. 1997-07-09 07:19 H.J. Lu <hjl@gnu.ai.mit.edu> * posix/execvp.c (execvp): Handle ESTALE. 1997-07-10 13:54 Ulrich Drepper <drepper@cygnus.com> * posix/regex.c: Make CHAR_SET_SIZE definition always available, even if SYNTAX_TABLE is defined. Patch by Akim Demaille <demaille@inf.enst.fr>. 1997-07-09 08:16 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/fileops.c (_IO_file_underflow): Adjust pointers before calling _IO_SYSREAD (). 1997-07-07 22:54 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/sparc/divrem.m4: Eliminate use of "DEFS.h" (sysdep.h does the same job). * sysdeps/sparc/alloca.S: Likewise. * sysdeps/sparc/dotmul.S: Likewise. * sysdeps/sparc/udiv_qrnnd.S: Likewise. * sysdeps/sparc/rem.S: Regenerated. * sysdeps/sparc/sdiv.S: Regenerated. * sysdeps/sparc/udiv.S: Regenerated. * sysdeps/sparc/urem.S: Regenerated. * sysdeps/sparc/DEFS.h: Removed. * sysdeps/sparc/elf/DEFS.h: Removed. * sysdeps/sparc/Dist: Don't distribute DEFS.h. * sysdeps/unix/sparc/sysdep.h: Use 4 byte alignment. Add .type directive #ifdef HAVE_ELF. Minor format changes. * sysdeps/alpha/DEFS.h: Removed. * sysdeps/alpha/Dist: Don't distribute DEFS.h. 1997-07-07 19:03 H.J. Lu <hjl@gnu.ai.mit.edu> * math/test-fenv.c (feenv_nomask_test): Move fesetenv (FE_NOMASK_ENV) after fork () to work with SMP. * sysdeps/i386/fpu_control.h (_FPU_IEEE): Fix comment. 1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add _IO_peekc_locked. 1997-07-07 15:45 Fila Kolodny <fila@ibi.com> * Makeconfig: Add dbobjdir to rpath-link analogous to nssobjdir. 1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/feholdexcpt.c: Shift the exception mask in the right position. * sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise. 1997-07-08 13:59 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c (spaces, zeroes): Handle broken SGI compiler. Patch by Richard Stallman <rms@gnu.ai.mit.edu>.
454 lines
11 KiB
C
454 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 <bits/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 tablename_val = NULL;
|
|
static u_long tablename_len = 0;
|
|
|
|
#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)
|
|
|
|
/* 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) ||
|
|
__type_of (result->objects.objects_val) != ENTRY_OBJ ||
|
|
strcmp(result->objects.objects_val[0].EN_data.en_type,
|
|
"hosts_tbl") != 0 ||
|
|
result->objects.objects_val[0].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 == ' ')
|
|
{
|
|
*line = '\0';
|
|
++line;
|
|
++i;
|
|
}
|
|
else
|
|
host->h_aliases[i+1] = NULL;
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
static enum nss_status
|
|
_nss_create_tablename (void)
|
|
{
|
|
if (tablename_val == NULL)
|
|
{
|
|
char buf [40 + strlen (nis_local_directory ())];
|
|
char *p;
|
|
|
|
p = stpcpy (buf, "hosts.org_dir.");
|
|
p = stpcpy (p, nis_local_directory ());
|
|
tablename_val = strdup (buf);
|
|
if (tablename_val == NULL)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
tablename_len = strlen (tablename_val);
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_sethostent (void)
|
|
{
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (result)
|
|
nis_freeresult (result);
|
|
result = NULL;
|
|
|
|
if (tablename_val == NULL)
|
|
if (_nss_create_tablename() != NSS_STATUS_SUCCESS)
|
|
status = NSS_STATUS_UNAVAIL;
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_endhostent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
if (result)
|
|
nis_freeresult (result);
|
|
result = 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)
|
|
{
|
|
if (tablename_val == NULL)
|
|
if (_nss_create_tablename() != NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
result = nis_first_entry(tablename_val);
|
|
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(tablename_val, &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 (tablename_val == NULL)
|
|
if (_nss_create_tablename() != NSS_STATUS_SUCCESS)
|
|
{
|
|
*herrnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (name == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
*herrnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
{
|
|
nis_result *result;
|
|
char buf[strlen (name) + 255 + tablename_len];
|
|
|
|
/* 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_PATH | FOLLOW_LINKS, 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) ||
|
|
__type_of (result->objects.objects_val) != ENTRY_OBJ ||
|
|
strcmp(result->objects.objects_val->EN_data.en_type,
|
|
"hosts_tbl") != 0 ||
|
|
result->objects.objects_val->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_PATH | FOLLOW_LINKS, 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 (tablename_val == NULL)
|
|
if (_nss_create_tablename() != NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (addr == NULL)
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
{
|
|
nis_result *result;
|
|
char buf[255 + tablename_len];
|
|
int retval, parse_res;
|
|
|
|
snprintf(buf, sizeof (buf) -1, "[addr=%s],%s",
|
|
inet_ntoa (*(struct in_addr *)addr), tablename_val);
|
|
result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, 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;
|
|
}
|
|
}
|