glibc/nis/nss_nisplus/nisplus-service.c

309 lines
8.0 KiB
C
Raw Normal View History

Update. 1997-03-19 01:40 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sco3.2.4/Dist: New file. * sysdeps/unix/sysv/sysv4/Dist: Add __getpgid.c and __setpgid.c. * sysdeps/unix/bsd/Dist: Add bsdstat.h, setrgid.c, and setruid.c. * sysdeps/unix/sysv/Dist: Add direct.h. * sysdeps/unix/sysv/linux/Dist: Add netinet/tcp.h. * Make-dist ($(tardir).tar): Prefer writing temporary file to $TMPDIR is available. The default is /tmp. * sysdeps/generic/ip.h: Move to... * sysdeps/generic/netinet/ip.h: ...here. * Makefile (tests): Quote $(CC) argument to isomac program. Patch by H.J. Lu <hjl@gnu.ai.mit.edu>. * sysdeps/i386/setjmp.S (__setjmp): Fix fatal bug where 0 argument is placed in wrong place on the stack. Reported by Marc Lehmann <mlehmann@hildesheim.sgh-net.de>. * sysdeps/tst-setjmp.c: Add new test for above problem. * sysdeps/libm-i387/e_pow.S: Compute PIC addres early. * sysdeps/libm-i387/e_powf.S: Likewise. * sysdeps/libm-i387/e_powl.S: Likewise. 1997-03-18 23:18 Ulrich Drepper <drepper@cygnus.com> * time/offtime.c (__offtime): Change type of `yg' to long int. Reported by a sun <asun@zoology.washington.edu>. 1997-03-18 23:08 a sun <asun@zoology.washington.edu> * sysdeps/unix/sysv/linux/net/if_ppp.h (PPP_VERSION): Define to 2.2.0 to prevent version mismatch. 1997-03-17 19:26 Andreas Jaeger <aj@arthur.pfalz.de> * stdio-common/printf_fphex.c (MIN): Only define MIN if not already defined. 1997-03-14 23:34 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/termbits.h: Leave ioctl numbers in ioctls.h. * elf/rtld.c (_dl_start): Call elf_machine_runtime_setup when the loader first relocates itself. * sysdeps/powerpc/elf/start.c (__start1): Fix bug for static objects. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Fix bugs in jump slot relocation. Prefer relative branches (some PowerPC chips don't predict absolute branches). (elf_machine_runtime_setup): Simplify and correct expressions. (RTLD_START): Fix bug changing _dl_starting_up. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Added. Deal with strange Linux/PPC padding of initial stack. 1997-03-11 04:14 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/termbits.h: Increase NCCS to 39, for future expansion. * sysdeps/unix/sysv/linux/powerpc/sys/kernel_termios.h: Added. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Explain why it can't have a switch statement. * sysdeps/powerpc/elf/start.c (__start1): Explain why it can't be static. * sysdeps/powerpc/elf/start.c (_start): Use .previous to avoid confusing gcc's idea of the current section. * sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE, RTLD_START): Likewise. 1997-03-08 09:10 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/dl-machine.h (elf_machine_rela, elf_machine_runtime_setup): Flush data & instruction caches when necessary, for 603/604 support. Add better support for large PLTs. (elf_machine_rela): Remove relocations that wouldn't work if anyone ever used them. Use memcpy for copy reloc, it'll be safe. Never target branch relocations at a PLT entry. * sysdeps/powerpc/bsd-setjmp.S: Make jump to PLT entry if we are generating PIC. * sysdeps/powerpc/bsd-_setjmp.S: Likewise. * sysdeps/powerpc/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/clone.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/syscall.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Likewise. * sysdeps/powerpc/elf/start.c: Clean up. * sysdeps/powerpc/__longjmp.S: Return 'value' as result from setjmp call. * sysdeps/unix/sysv/linux/powerpc/statbuf.h: New file. 1997-03-09 12:36 H.J. Lu <hjl@gnu.ai.mit.edu> * Make-dist (srcs): Add $(test-srcs). * MakeTAGS (all-sources): Likewise. * Makerules (depfiles, common-mostlyclean): Likewise. * Rules (tests): Likewise. 1997-03-18 05:28 Roland McGrath <roland@frob.com> * elf/dl-reloc.c (RESOLVE): Don't try to resolve ocal symbols. 1997-03-17 21:39 Philip Blundell <phil@london.uk.eu.org> * nis/nss_nis/nis-service.c (_nss_nis_getservbyname_r): Allow protocol=NULL to match any protocol rather than returning an error. 1997-03-17 19:00 Philip Blundell <phil@london.uk.eu.org> * nss/nss_files/files-service.c (servbyname): Match any protocol if proto==NULL. 1997-03-18 05:17 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: Don't define O_NORW. * sysdeps/unix/sysv/linux/fcntlbits.h: Likewise. Proposed by Thomas Bushnell, n/BSG. 1997-03-18 07:53 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/generic/setenv.c (setenv): Don't copy name when we reuse the buffer for replacement. 1997-03-16 19:30 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/syscalls.list: Add sys_fstat, sys_lstat and sys_stat. 1997-03-17 12:43 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> Add NIS+ functions * shlib-versions: Add libnss_nisplus. * nis/Makefile: Add NIS+ source files. * nis/nis_call.c: New file. * nis/nis_clone.c: New file. * nis/nis_error.c: New file. * nis/nis_file.c: New file. * nis/nis_free.c: New file. * nis/nis_intern.c: New file. * nis/nis_intern.h: New file. * nis/nis_local_names.c: New file. * nis/nis_names.c: New file. * nis/nis_print.c: New file. * nis/nis_server.c: New file. * nis/nis_subr.c: New file. * nis/nis_table.c: New file. * nis/nis_xdr.c: New file. * nis/nss-nisplus.h: New file. * nis/nss_nisplus/nisplus-alias.c: New file. * nis/nss_nisplus/nisplus-ethers.c: New file. * nis/nss_nisplus/nisplus-grp.c: New file. * nis/nss_nisplus/nisplus-hosts.c: New file. * nis/nss_nisplus/nisplus-netgrp.c: New file. * nis/nss_nisplus/nisplus-network.c: New file. * nis/nss_nisplus/nisplus-proto.c: New file. * nis/nss_nisplus/nisplus-publickey.c: New file. * nis/nss_nisplus/nisplus-pwd.c: New file. * nis/nss_nisplus/nisplus-rpc.c: New file. * nis/nss_nisplus/nisplus-service.c: New file. * nis/nss_nisplus/nisplus-spwd.c: New file. * nis/rpcsvc/nis.h: New file. * nis/rpcsvc/nis.x: New file. * nis/rpcsvc/nis_object.x: New file. * nis/rpcsvc/nis_tags.h: New file. * nis/rpcsvc/nislib.h: New file. 1997-03-17 12:52 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * mach/devstream.c (output/write_some): Don't try and write more than IO_INBAND_MAX in a single call to device_write_inband. * sysdeps/libm-ieee754/w_atan2.c: Don't ignore exception if library * sysdeps/libm-ieee754/w_atan2f.c: Likewise. * sysdeps/libm-ieee754/w_atan2l.c: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h (msync): Add description for * stdlib/atoll.c: Undefine atoll, not atol.
1997-03-19 05:47:56 +00:00
/* 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 <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 ENTNAME servent
#define DATABASE "services"
#define TRAILING_LIST_MEMBER s_aliases
#define TRAILING_LIST_SEPARATOR_P isspace
#include "../../nss/nss_files/files-parse.c"
#define ISSLASH(c) ((c) == '/')
LINE_PARSER
("#",
STRING_FIELD (result->s_name, isspace, 1);
INT_FIELD (result->s_port, ISSLASH, 10, 0, htons);
STRING_FIELD (result->s_proto, isspace, 1);
)
#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)
static int
_nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
char *buffer, size_t buflen)
{
char *p = buffer;
size_t room_left = buflen;
int i;
struct parser_data *data = (void *) buffer;
if (result == NULL)
return -1;
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,
"services_tbl") != 0 ||
result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
return -1;
memset (p, '\0', room_left);
/* Generate the services entry format and use the normal parser */
if (NISENTRYLEN (0, 0, result) + 1 > room_left)
{
__set_errno (ERANGE);
return -1;
}
strncpy (p, NISENTRYVAL (0, 0, result), NISENTRYLEN (0, 0, result));
room_left -= (NISENTRYLEN (0, 0, result) + 1);
if (NISENTRYLEN (0, 3, result) + 1 > room_left)
{
__set_errno (ERANGE);
return -1;
}
strcat (p, "\t");
strncat (p, NISENTRYVAL (0, 3, result), NISENTRYLEN (0, 3, result));
room_left -= (NISENTRYLEN (0, 3, result) + 1);
if (NISENTRYLEN (0, 2, result) + 1 > room_left)
{
__set_errno (ERANGE);
return -1;
}
strcat (p, "/");
strncat (p, NISENTRYVAL (0, 2, result), NISENTRYLEN (0, 2, result));
room_left -= (NISENTRYLEN (0, 2, result) + 1);
for (i = 1; i < result->objects.objects_len; i++)
{
if (NISENTRYLEN (i, 1, result) + 1 > room_left)
{
__set_errno (ERANGE);
return -1;
}
strcat (p, " ");
strcat (p, NISENTRYVAL (i, 1, result));
room_left -= (NISENTRYLEN (i, 1, result) + 1);
}
return _nss_files_parse_servent (p, serv, data, buflen);
}
enum nss_status
_nss_nisplus_setservent (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_endservent (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_getservent_r (struct servent *serv, char *buffer,
size_t buflen)
{
int parse_res;
/* Get the next entry until we found a correct one. */
do
{
if (result == NULL)
{
names = nis_getnames ("services.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)
return niserr2nss (result->status);
}
else
{
nis_result *res;
res = nis_next_entry (names[0], &result->cookie);
nis_freeresult (result);
result = res;
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
return niserr2nss (result->status);
}
parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
}
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 (name == NULL || protocol == NULL)
{
__set_errno (EINVAL);
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,proto=%s],services.org_dir", name,
protocol);
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,
"services_tbl") != 0 ||
result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
sprintf (buf, "[cname=%s,proto=%s],services.org_dir", name, protocol);
else
sprintf (buf, "[cname=%s,proto=%s],services.org_dir",
NISENTRYVAL (0, 0, result), protocol);
nis_freeresult (result);
result = nis_list (buf, EXPAND_NAME, 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)
return NSS_STATUS_SUCCESS;
if (!parse_res && errno == ERANGE)
return NSS_STATUS_TRYAGAIN;
else
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)
{
int parse_res;
nis_result *result;
char buf[60 + strlen (protocol)];
if (protocol == NULL)
{
__set_errno (EINVAL);
return NSS_STATUS_NOTFOUND;
}
snprintf (buf, sizeof (buf), "[number=%d,proto=%s],services.org_dir",
number, protocol);
result = nis_list (buf, EXPAND_NAME, 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)
return NSS_STATUS_SUCCESS;
if (!parse_res && errno == ERANGE)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
}