mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
3996f34b46
1997-07-28 23:35 Ulrich Drepper <drepper@cygnus.com> * csu/gmon-start.c (__gmon_start__): Call __monstartup not monstartup. * gmon/gmon.c: Rename moncontrol to __moncontrol and monstartup to __monstartup. * gmon/sys/gmon.h: Fix prototypes. * gmon/sys/gmon_out.h: Pretty print. * gmon/bb_exit_func.c (__bb_exit_func): Use memcpy instead of bcopy. * gmon/gmon.c (__monstartup): Likewise. (write_hist): Remove dependency on 32 int. (_mcleanup): Don't call perror, use fprintf. * elf/dl-load.c: Fix handling of current directory in search path. * elf/Makefile (dl-routines): Add dl-profile. * elf/dl-profile.c: New file. * elf/dl-runtime.c (fixup): Add new parameter with address to store relocation result in to elf_machine_relplt. (profile_fixup): New function. * elf/do-rel.h (elf_dynamic_do_rel): Add new parameter with address to store relocation result in to elf_machine_relplt. * elf/dl-support.c: Define _dl_profile and _dl_profile_map. * elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Add new parameter and call elf_machine_runtime_setup with extra argument. * elf/dl-reloc.c (_dl_relocate_object): Add new argument to ELF_DYNAMIC_RELOCATE. * elf/link.h: Add prototypes for new functions and variables. * elf/rtld.c: Parse LD_PROFILE and LD_PROFILE_OUTPUT environment variables and call _dl_start_profile if necessary. * include/sys/gmon_out.h: New file. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Add new parameter to enable profiling. (elf_machine_rela): Add new parameter to specify place to store result in. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * sysdeps/mips/mips64/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/sparc/dl-machine.h: Likewise. * sysdeps/sparc64/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. (elf_machine_runtime_setup): Setup got[2] to _dl_runtime_resolve if we do profiling. (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add code for _dl_runtime_profile. * nis/nss_compat/compat-grp.c (internal_setgrent): Set FD_CLOEXEC for stream on input file. * nis/nss_compat/compat-pwd.c (internal_setpwent): Likewise. * nis/nss_compat/compat-spwd.c (internal_setspent): Likewise. * nss/nss_db/db-XXX.c (internal_setent): Likewise. * nss/nss_db/db-alias.c (internal_setent): Likewise. * nss/nss_db/db-netgrp.c (internal_setent): Likewise. * nss/nss_files/files-XXX.c (internal_setent): Likewise. * nss/nss_files/files-alias.c (internal_setent): Likewise. * nss/nss_files/files-netgrp.c (internal_setent): Likewise. * string/string.h: Pretty print. * sysdeps/i386/fpu/bits/mathinline.h: Major update by John Bowman. Add float and long double versions. 1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/rtld.c (print_unresolved): Replace empty object name by main program name. 1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/htons.c (htons): Renamed from __htons. 1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/bits/byteswap.h: New file. 1997-07-27 23:50 Philip Blundell <Philip.Blundell@pobox.com> * inet/netinet/icmp6.h: Update for new drafts of POSIX.1g and IPv6 advanced API. * inet/netinet/in.h: Likewise. * inet/netinet/ip6.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * posix/sys/types.h: Add socklen_t. * manual/socket.texi: Document some more IPv6 things. * manual/libc.texinfo: Likewise. 1997-07-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Define missing symbol. 1997-07-27 14:31 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/Makefile: Add nis_findserv. * nis/lckcache.c: Fix typo. * nis/nis_call.c: Fix problems with multihomed servers. * nis/nis_findserv.c: New file. * nis/nis_intern.h: Add more prototypes. * nis/nis_lookup.c (nis_lookup): Don't try the next server if network is unreachable. * nis/nis_table.c (nis_list): Likewise. * nis/nis_ping.c (nis_ping): Use MASTER_ONLY, don't call abort() in error case. * nis/nis_util.c (__nis_finddirectory): Give the right error code back. * nis/ypclnt.c: Make sure, that all sockets are closed.
504 lines
12 KiB
C
504 lines
12 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 <string.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <rpcsvc/nislib.h>
|
|
#include "nis_intern.h"
|
|
|
|
static void
|
|
splitname (const_nis_name name, nis_name *ibr_name, int *srch_len,
|
|
nis_attr **srch_val)
|
|
{
|
|
char *cptr, *key, *val, *next;
|
|
int size;
|
|
|
|
if (name == NULL)
|
|
return;
|
|
|
|
cptr = strdup (name);
|
|
if (srch_len)
|
|
*srch_len = 0;
|
|
if (srch_val)
|
|
*srch_val = NULL;
|
|
size = 0;
|
|
|
|
/* Not of "[key=value,key=value,...],foo.." format? */
|
|
if (cptr[0] != '[')
|
|
{
|
|
*ibr_name = cptr;
|
|
return;
|
|
}
|
|
|
|
*ibr_name = strchr (cptr, ']');
|
|
if (*ibr_name == NULL || (*ibr_name)[1] != ',')
|
|
{
|
|
free (cptr);
|
|
*ibr_name = NULL;
|
|
return;
|
|
}
|
|
|
|
*ibr_name[0] = '\0';
|
|
*ibr_name += 2;
|
|
*ibr_name = strdup (*ibr_name);
|
|
|
|
if (srch_len == NULL || srch_val == NULL)
|
|
{
|
|
free (cptr);
|
|
return;
|
|
}
|
|
|
|
key = (cptr) + 1;
|
|
do
|
|
{
|
|
next = strchr (key, ',');
|
|
if (next)
|
|
{
|
|
next[0] = '\0';
|
|
++next;
|
|
}
|
|
|
|
val = strchr (key, '=');
|
|
if (!val)
|
|
{
|
|
free (cptr);
|
|
*srch_val = malloc (sizeof (nis_attr));
|
|
if (*srch_val == NULL)
|
|
{
|
|
free (cptr);
|
|
free (*ibr_name);
|
|
*ibr_name = NULL;
|
|
return;
|
|
}
|
|
(*srch_val)[0].zattr_val.zattr_val_len = 0;
|
|
(*srch_val)[0].zattr_val.zattr_val_val = NULL;
|
|
return;
|
|
}
|
|
|
|
val[0] = '\0';
|
|
++val;
|
|
|
|
if ((*srch_len) + 1 >= size)
|
|
{
|
|
size += 10;
|
|
if (size == 10)
|
|
*srch_val = malloc (size * sizeof (char *));
|
|
else
|
|
*srch_val = realloc (val, size * sizeof (char *));
|
|
if (*srch_val == NULL)
|
|
{
|
|
free (cptr);
|
|
free (*ibr_name);
|
|
*ibr_name = NULL;
|
|
return;
|
|
}
|
|
}
|
|
|
|
(*srch_val)[*srch_len].zattr_ndx = strdup (key);
|
|
if (((*srch_val)[*srch_len].zattr_ndx) == NULL)
|
|
{
|
|
free (cptr);
|
|
free (*ibr_name);
|
|
*ibr_name = NULL;
|
|
return;
|
|
}
|
|
(*srch_val)[*srch_len].zattr_val.zattr_val_len = strlen (val) + 1;
|
|
(*srch_val)[*srch_len].zattr_val.zattr_val_val = strdup (val);
|
|
if ((*srch_val)[*srch_len].zattr_val.zattr_val_val == NULL)
|
|
{
|
|
free (cptr);
|
|
free (*ibr_name);
|
|
*ibr_name = NULL;
|
|
return;
|
|
}
|
|
++(*srch_len);
|
|
|
|
key = next;
|
|
|
|
}
|
|
while (next);
|
|
|
|
free (cptr);
|
|
}
|
|
|
|
static struct ib_request *
|
|
__create_ib_request (const_nis_name name, struct ib_request *ibreq,
|
|
u_long flags)
|
|
{
|
|
splitname (name, &ibreq->ibr_name, &ibreq->ibr_srch.ibr_srch_len,
|
|
&ibreq->ibr_srch.ibr_srch_val);
|
|
if (ibreq->ibr_name == NULL)
|
|
return NULL;
|
|
|
|
ibreq->ibr_flags = (flags & (RETURN_RESULT | ADD_OVERWRITE | REM_MULTIPLE |
|
|
MOD_SAMEOBJ | ADD_RESERVED | REM_RESERVED |
|
|
MOD_EXCLUSIVE));
|
|
ibreq->ibr_obj.ibr_obj_len = 0;
|
|
ibreq->ibr_obj.ibr_obj_val = NULL;
|
|
ibreq->ibr_cbhost.ibr_cbhost_len = 0;
|
|
ibreq->ibr_cbhost.ibr_cbhost_val = NULL;
|
|
ibreq->ibr_bufsize = 0;
|
|
ibreq->ibr_cookie.n_len = 0;
|
|
ibreq->ibr_cookie.n_bytes = NULL;
|
|
|
|
return ibreq;
|
|
}
|
|
|
|
nis_result *
|
|
nis_list (const_nis_name name, u_long flags,
|
|
int (*callback) (const_nis_name name,
|
|
const nis_object *object,
|
|
const void *userdata),
|
|
const void *userdata)
|
|
{
|
|
nis_result *res = NULL;
|
|
struct ib_request ibreq;
|
|
int status;
|
|
int count_links = 0; /* We will only follow 16 links! */
|
|
int done = 0;
|
|
nis_name *names;
|
|
nis_name namebuf[2] = {NULL, NULL};
|
|
int name_nr = 0;
|
|
|
|
res = calloc (1, sizeof (nis_result));
|
|
|
|
if (__create_ib_request (name, &ibreq, flags) == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
|
|
if (flags & EXPAND_NAME)
|
|
{
|
|
names = nis_getnames (ibreq.ibr_name);
|
|
free (ibreq.ibr_name);
|
|
ibreq.ibr_name = NULL;
|
|
if (names == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
ibreq.ibr_name = strdup (names[name_nr]);
|
|
}
|
|
else
|
|
names = namebuf;
|
|
|
|
while (!done)
|
|
{
|
|
memset (res, '\0', sizeof (nis_result));
|
|
|
|
status = __do_niscall (ibreq.ibr_name, NIS_IBLIST,
|
|
(xdrproc_t) xdr_ib_request,
|
|
(caddr_t) &ibreq, (xdrproc_t) xdr_nis_result,
|
|
(caddr_t) res, flags);
|
|
if (status != NIS_SUCCESS)
|
|
res->status = status;
|
|
|
|
switch (res->status)
|
|
{
|
|
case NIS_PARTIAL:
|
|
case NIS_SUCCESS:
|
|
case NIS_S_SUCCESS:
|
|
if (__type_of(NIS_RES_OBJECT (res)) == LINK_OBJ &&
|
|
flags & FOLLOW_LINKS) /* We are following links */
|
|
{
|
|
/* if we hit the link limit, bail */
|
|
if (count_links > NIS_MAXLINKS)
|
|
{
|
|
res->status = NIS_LINKNAMEERROR;
|
|
++done;
|
|
break;
|
|
}
|
|
if (count_links)
|
|
free (ibreq.ibr_name);
|
|
++count_links;
|
|
free (ibreq.ibr_name);
|
|
ibreq.ibr_name = strdup (NIS_RES_OBJECT (res)->LI_data.li_name);
|
|
if (NIS_RES_OBJECT (res)->LI_data.li_attrs.li_attrs_len)
|
|
if (ibreq.ibr_srch.ibr_srch_len == 0)
|
|
{
|
|
ibreq.ibr_srch.ibr_srch_len =
|
|
NIS_RES_OBJECT (res)->LI_data.li_attrs.li_attrs_len;
|
|
ibreq.ibr_srch.ibr_srch_val =
|
|
NIS_RES_OBJECT (res)->LI_data.li_attrs.li_attrs_val;
|
|
}
|
|
nis_freeresult (res);
|
|
res = calloc (1, sizeof (nis_result));
|
|
}
|
|
else
|
|
++done;
|
|
break;
|
|
case NIS_CBRESULTS:
|
|
/* XXX Implement CALLBACK here ! */
|
|
++done;
|
|
break;
|
|
case NIS_UNAVAIL:
|
|
/* NIS+ is not installed, or all servers are down */
|
|
++done;
|
|
break;
|
|
default:
|
|
/* Try the next domainname if we don't follow a link */
|
|
if (count_links)
|
|
{
|
|
free (ibreq.ibr_name);
|
|
res->status = NIS_LINKNAMEERROR;
|
|
++done;
|
|
break;
|
|
}
|
|
++name_nr;
|
|
if (names[name_nr] == NULL)
|
|
{
|
|
++done;
|
|
break;
|
|
}
|
|
ibreq.ibr_name = names[name_nr];
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (names != namebuf)
|
|
nis_freenames (names);
|
|
|
|
nis_free_request (&ibreq);
|
|
|
|
if (callback != NULL &&
|
|
(res->status == NIS_SUCCESS || res->status == NIS_S_SUCCESS))
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < res->objects.objects_len; ++i)
|
|
if ((*callback) (name, &(res->objects.objects_val)[i], userdata) != 0)
|
|
break;
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
nis_result *
|
|
nis_add_entry (const_nis_name name, const nis_object *obj,
|
|
u_long flags)
|
|
{
|
|
nis_result *res;
|
|
nis_error status;
|
|
struct ib_request ibreq;
|
|
char *p1, *p2, *p3, *p4;
|
|
char buf1 [strlen (name) + 20];
|
|
char buf4 [strlen (name) + 20];
|
|
|
|
res = calloc (1, sizeof (nis_result));
|
|
|
|
if (__create_ib_request (name, &ibreq, flags) == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
|
|
ibreq.ibr_flags = flags;
|
|
ibreq.ibr_obj.ibr_obj_val = nis_clone_object (obj, NULL);
|
|
ibreq.ibr_obj.ibr_obj_len = 1;
|
|
|
|
p1 = ibreq.ibr_obj.ibr_obj_val->zo_name;
|
|
if (p1 == NULL || strlen (p1) == 0)
|
|
ibreq.ibr_obj.ibr_obj_val->zo_name =
|
|
nis_leaf_of_r (name, buf1, sizeof (buf1));
|
|
|
|
p2 = ibreq.ibr_obj.ibr_obj_val->zo_owner;
|
|
if (p2 == NULL || strlen (p2) == 0)
|
|
ibreq.ibr_obj.ibr_obj_val->zo_owner = nis_local_principal ();
|
|
|
|
p3 = ibreq.ibr_obj.ibr_obj_val->zo_group;
|
|
if (p3 == NULL || strlen (p3) == 0)
|
|
ibreq.ibr_obj.ibr_obj_val->zo_group = nis_local_group ();
|
|
|
|
p4 = ibreq.ibr_obj.ibr_obj_val->zo_domain;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_domain =
|
|
nis_domain_of_r (name, buf4, sizeof (buf4));
|
|
|
|
if ((status = __do_niscall (ibreq.ibr_name, NIS_IBADD,
|
|
(xdrproc_t) xdr_ib_request,
|
|
(caddr_t) &ibreq,
|
|
(xdrproc_t) xdr_nis_result,
|
|
(caddr_t) res, 0)) != NIS_SUCCESS)
|
|
res->status = status;
|
|
|
|
ibreq.ibr_obj.ibr_obj_val->zo_name = p1;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_owner = p2;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_group = p3;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_domain = p4;
|
|
|
|
nis_free_request (&ibreq);
|
|
|
|
return res;
|
|
}
|
|
|
|
nis_result *
|
|
nis_modify_entry (const_nis_name name, const nis_object *obj,
|
|
u_long flags)
|
|
{
|
|
nis_result *res;
|
|
nis_error status;
|
|
struct ib_request ibreq;
|
|
char *p1, *p2, *p3, *p4;
|
|
char buf1 [strlen (name) + 20];
|
|
char buf4 [strlen (name) + 20];
|
|
|
|
res = calloc (1, sizeof (nis_result));
|
|
|
|
if (__create_ib_request (name, &ibreq, flags) == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
|
|
ibreq.ibr_flags = flags;
|
|
ibreq.ibr_obj.ibr_obj_val = nis_clone_object (obj, NULL);
|
|
ibreq.ibr_obj.ibr_obj_len = 1;
|
|
|
|
p1 = ibreq.ibr_obj.ibr_obj_val->zo_name;
|
|
if (p1 == NULL || strlen (p1) == 0)
|
|
ibreq.ibr_obj.ibr_obj_val->zo_name =
|
|
nis_leaf_of_r (name, buf1, sizeof (buf1));
|
|
|
|
p2 = ibreq.ibr_obj.ibr_obj_val->zo_owner;
|
|
if (p2 == NULL || strlen (p2) == 0)
|
|
ibreq.ibr_obj.ibr_obj_val->zo_owner = nis_local_principal ();
|
|
|
|
p3 = ibreq.ibr_obj.ibr_obj_val->zo_group;
|
|
if (p3 == NULL || strlen (p3) == 0)
|
|
ibreq.ibr_obj.ibr_obj_val->zo_group = nis_local_group ();
|
|
|
|
p4 = ibreq.ibr_obj.ibr_obj_val->zo_domain;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_domain =
|
|
nis_domain_of_r (name, buf4, sizeof (buf4));
|
|
|
|
if ((status = __do_niscall (ibreq.ibr_name, NIS_IBMODIFY,
|
|
(xdrproc_t) xdr_ib_request,
|
|
(caddr_t) & ibreq, (xdrproc_t) xdr_nis_result,
|
|
(caddr_t) res, 0)) != NIS_SUCCESS)
|
|
res->status = status;
|
|
|
|
ibreq.ibr_obj.ibr_obj_val->zo_name = p1;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_owner = p2;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_group = p3;
|
|
ibreq.ibr_obj.ibr_obj_val->zo_domain = p4;
|
|
|
|
nis_free_request (&ibreq);
|
|
|
|
return res;
|
|
}
|
|
|
|
nis_result *
|
|
nis_remove_entry (const_nis_name name, const nis_object *obj,
|
|
u_long flags)
|
|
{
|
|
nis_result *res;
|
|
struct ib_request ibreq;
|
|
nis_error status;
|
|
|
|
res = calloc (1, sizeof (nis_result));
|
|
|
|
if (__create_ib_request (name, &ibreq, flags) == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
|
|
ibreq.ibr_flags = flags;
|
|
if (obj != NULL)
|
|
{
|
|
ibreq.ibr_obj.ibr_obj_val = nis_clone_object (obj, NULL);
|
|
ibreq.ibr_obj.ibr_obj_len = 1;
|
|
}
|
|
|
|
if ((status = __do_niscall (ibreq.ibr_name, NIS_IBREMOVE,
|
|
(xdrproc_t) xdr_ib_request,
|
|
(caddr_t) & ibreq, (xdrproc_t) xdr_nis_result,
|
|
(caddr_t) res, 0)) != NIS_SUCCESS)
|
|
res->status = status;
|
|
|
|
nis_free_request (&ibreq);
|
|
|
|
return res;
|
|
}
|
|
|
|
nis_result *
|
|
nis_first_entry (const_nis_name name)
|
|
{
|
|
nis_result *res;
|
|
struct ib_request ibreq;
|
|
nis_error status;
|
|
|
|
res = calloc (1, sizeof (nis_result));
|
|
|
|
if (__create_ib_request (name, &ibreq, 0) == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
|
|
if ((status = __do_niscall (ibreq.ibr_name, NIS_IBFIRST,
|
|
(xdrproc_t) xdr_ib_request,
|
|
(caddr_t) &ibreq, (xdrproc_t) xdr_nis_result,
|
|
(caddr_t) res, 0)) != NIS_SUCCESS)
|
|
res->status = status;
|
|
|
|
nis_free_request (&ibreq);
|
|
|
|
return res;
|
|
}
|
|
|
|
nis_result *
|
|
nis_next_entry (const_nis_name name, const netobj *cookie)
|
|
{
|
|
nis_result *res;
|
|
struct ib_request ibreq;
|
|
nis_error status;
|
|
|
|
res = calloc (1, sizeof (nis_result));
|
|
|
|
if (__create_ib_request (name, &ibreq, 0) == NULL)
|
|
{
|
|
res->status = NIS_BADNAME;
|
|
return res;
|
|
}
|
|
|
|
if (cookie != NULL)
|
|
{
|
|
ibreq.ibr_cookie.n_bytes = malloc (cookie->n_len);
|
|
if (ibreq.ibr_cookie.n_bytes == NULL)
|
|
{
|
|
res->status = NIS_NOMEMORY;
|
|
free (res);
|
|
return NULL;
|
|
}
|
|
memcpy (ibreq.ibr_cookie.n_bytes, cookie->n_bytes, cookie->n_len);
|
|
ibreq.ibr_cookie.n_len = cookie->n_len;
|
|
}
|
|
|
|
if ((status = __do_niscall (ibreq.ibr_name, NIS_IBNEXT,
|
|
(xdrproc_t) xdr_ib_request,
|
|
(caddr_t) &ibreq, (xdrproc_t) xdr_nis_result,
|
|
(caddr_t) res, 0)) != NIS_SUCCESS)
|
|
res->status = status;
|
|
|
|
nis_free_request (&ibreq);
|
|
|
|
return res;
|
|
}
|