mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 03:20:05 +00:00
60c966358e
1997-07-22 01:35 Ulrich Drepper <drepper@cygnus.com> * Makerules (+make-deps): Use $(CFLAGS) in run of $(+mkdep) so that optimizing is also selected for dependency generation. * configure.in: Add machine description for TI c[34]x. * inet/Makefile (routines): Remove ntohl and ntohs. * inet/netinet/in.h: Use optimized version of hton? and ntoh? for little endian machines. * sysdeps/alpha/ntohl.s: Removed. * sysdeps/alpha/ntohs.s: Removed. * sysdeps/generic/ntohl.c: Removed. * sysdeps/generic/ntohs.c: Removed. * sysdeps/generic/htonl.c: Add aliases for ntohl. * sysdeps/vax/htonl.s: Likewise. * sysdeps/generic/htons.c: Add aliases for ntohs. * sysdeps/vax/htons.s: Likewise. * sysdeps/vax/ntohl.s: Removed. * sysdeps/vax/ntohs.s: Removed. * sysdeps/generic/bits/htontoh.h: New file. * sysdeps/i386/htonl.S: New file. * sysdeps/i386/htons.S: New file. * sysdeps/i386/i486/htonl.S: New file. * sysdeps/i386/fpu/bits/mathinline.h: Correct and optimized compare macros. * sysdeps/mips/dl-machine.h: Remove mips64 dependent parts. * sysdeps/mips/mips64/dl-machine.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Don't install syscall-list.h. 1997-07-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Add missing symbol _obstack. 1997-07-14 08:22 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/mips/rtld-parms: New. * sysdeps/unix/sysv/linux/mips/lxstat.h: Moved to * sysdeps/unix/sysv/linux/mips/lxstat.c: ...this. * sysdeps/unix/sysv/linux/mips/sgidef.h: Moved to * sysdeps/unix/sysv/linux/mips/sgidefs.h: ...this. * sysdeps/generic/dl-sysdep.c (_start): Change to ENTRY_POINT. 1997-07-17 08:39 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/mips/dl-machine.h: Remove extra stuff. 1997-07-06 07:18 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/bits/endian.h: Handle multiple endianess. * stdlib/grouping.h: Suppress gcc warning about testing unsigned char for less-than-zero. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * sysdeps/powerpc/add_n.s: New file. * sysdeps/powerpc/sub_n.s: New file. * sysdeps/powerpc/lshift.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/mul_1.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/addmul_1.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/submul_1.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/rshift.s: Ported XCOFF->ELF (from GMP). * math/libm-test.c (cos_test, sin_test, sincos_test): Use precomputed pi/6 rather than having gcc calculate it, otherwise tests give inaccurate result due to inaccurate input. * math/libm.map: Add __fe_*_env constants to list of exported symbols. * sysdeps/libm-ieee754/s_isinf.c: Simplify, make faster. * sysdeps/libm-ieee754/s_isinff.c: Simplify, make faster. * sysdeps/libm-ieee754/s_atan2f.c: Correct value of pi to be correct round-to-nearest value. * sysdeps/libm-ieee754/e_log.c: Make sure exceptions are raised. * sysdeps/libm-ieee754/e_log10.c: Likewise. * sysdeps/libm-ieee754/e_log10f.c: Likewise. * sysdeps/libm-ieee754/e_logf.c: Likewise. * sysdeps/libm-ieee754/s_log1p.c: Likewise. Also use correct -Inf. * sysdeps/libm-ieee754/s_log1pf.c: Likewise. Also use correct -Inf. * sysdeps/libm-ieee754/s_log2.c: Likewise. * sysdeps/libm-ieee754/s_log2f.c: Likewise. 1997-07-15 21:54 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Fix "buffer to small" problems and memory leaks. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus-alias.c: Likewise. * nis/nss_nisplus-ethers.c: Likewise. * nis/nss_nisplus-grp.c: Likewise. * nis/nss_nisplus-hosts.c: Likewise. * nis/nss_nisplus-netgrp.c: Likewise. * nis/nss_nisplus-network.c: Likewise. * nis/nss_nisplus-proto.c: Likewise. * nis/nss_nisplus-pwd.c: Likewise. * nis/nss_nisplus-rpc.c: Likewise. * nis/nss_nisplus-service.c: Likewise. * nis/nss_nisplus-spwd.c: Likewise. * nis/nss_nisplus-parse.c: If buffer to small, give -1 back. 1997-07-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_rela): Mention program name in warning message. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Print program name first. 1997-07-20 19:33 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * libc.map: Add _null_auth and _seterr_reply. * sunrpc/clnt_udp.c (clntudp_call): If xargs is NULL, don't encode it.
377 lines
9.4 KiB
C
377 lines
9.4 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 <errno.h>
|
|
#include <ctype.h>
|
|
#include <netdb.h>
|
|
#include <string.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)
|
|
|
|
static int
|
|
_nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
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 (result->objects.objects_val) != 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)
|
|
{
|
|
no_more_room:
|
|
__set_errno (ERANGE);
|
|
return -1;
|
|
}
|
|
strncpy (first_unused, NISENTRYVAL (0, 0, result),
|
|
NISENTRYLEN (0, 0, result));
|
|
first_unused[NISENTRYLEN (0, 0, result)] = '\0';
|
|
serv->s_name = first_unused;
|
|
room_left -= (strlen (first_unused) +1);
|
|
first_unused += strlen (first_unused) +1;
|
|
|
|
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;
|
|
room_left -= (strlen (first_unused) +1);
|
|
first_unused += strlen (first_unused) +1;
|
|
|
|
serv->s_port = atoi (NISENTRYVAL (0, 3, result));
|
|
p = first_unused;
|
|
|
|
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;
|
|
*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 *));
|
|
serv->s_aliases = (char **) first_unused;
|
|
if (room_left < sizeof (char *))
|
|
goto no_more_room;
|
|
room_left -= (sizeof (char *));
|
|
serv->s_aliases[0] = NULL;
|
|
|
|
i = 0;
|
|
while (*line != '\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';
|
|
++line;
|
|
++i;
|
|
}
|
|
else
|
|
serv->s_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, "services.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_setservent (void)
|
|
{
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (result)
|
|
nis_freeresult (result);
|
|
result = NULL;
|
|
|
|
if (tablename_val == NULL)
|
|
status = _nss_create_tablename ();
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_endservent (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_getservent_r (struct servent *serv, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
int parse_res;
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
nis_result *saved_res;
|
|
|
|
if (result == NULL)
|
|
{
|
|
saved_res = 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)
|
|
return niserr2nss (result->status);
|
|
}
|
|
else
|
|
{
|
|
nis_result *res;
|
|
|
|
saved_res = result;
|
|
res = nis_next_entry (tablename_val, &result->cookie);
|
|
result = res;
|
|
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
nis_freeresult (saved_res);
|
|
return niserr2nss (result->status);
|
|
}
|
|
}
|
|
|
|
if ((parse_res = _nss_nisplus_parse_servent (result, serv, buffer,
|
|
buflen)) == -1)
|
|
{
|
|
nis_freeresult (result);
|
|
result = saved_res;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
if (saved_res)
|
|
nis_freeresult (saved_res);
|
|
}
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getservent_r (struct servent *result, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
int status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nisplus_getservent_r (result, buffer, buflen);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getservbyname_r (const char *name, const char *protocol,
|
|
struct servent *serv,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
int parse_res;
|
|
|
|
if (tablename_val == NULL)
|
|
if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (name == NULL || protocol == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
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,proto=%s],%s", name, protocol,
|
|
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,
|
|
"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 (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
|
|
|
|
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
enum nss_status status = niserr2nss (result->status);
|
|
|
|
nis_freeresult (result);
|
|
return status;
|
|
}
|
|
|
|
parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
|
|
nis_freeresult (result);
|
|
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
if (parse_res)
|
|
return NSS_STATUS_SUCCESS;
|
|
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getservbynumber_r (const int number, const char *protocol,
|
|
struct servent *serv,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
if (tablename_val == NULL)
|
|
if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (protocol == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
{
|
|
int parse_res;
|
|
nis_result *result;
|
|
char buf[60 + strlen (protocol) + tablename_len];
|
|
|
|
snprintf (buf, sizeof (buf), "[number=%d,proto=%s],%s",
|
|
number, protocol, tablename_val);
|
|
|
|
result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
|
|
|
|
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
enum nss_status status = niserr2nss (result->status);
|
|
|
|
nis_freeresult (result);
|
|
return status;
|
|
}
|
|
|
|
parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
|
|
nis_freeresult (result);
|
|
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
if (parse_res)
|
|
return NSS_STATUS_SUCCESS;
|
|
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|