diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-09-24 23:03:42 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-09-24 23:03:42 +0000 |
commit | 650425ceb40e840b2123b6c8cc65389589f41218 (patch) | |
tree | 70ff83fbe8f34a7829b4a0b511d2cb02ccbcbf2a /nis/nis_table.c | |
parent | 2604afb1b2d9acc3c70b1214285f996200bf0358 (diff) | |
download | glibc-650425ceb40e840b2123b6c8cc65389589f41218.zip glibc-650425ceb40e840b2123b6c8cc65389589f41218.tar.gz glibc-650425ceb40e840b2123b6c8cc65389589f41218.tar.bz2 |
Update.cvs/libc-ud-970924
1997-09-25 00:23 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-profile.c: Correct implementation.
* io/ftwtest-sh: Don't depend on TMPDIR == /tmp.
* locale/setlocale.c: Rewrite a bit for more clarity.
* math/Makefile (libm-calls): Add w_exp2.
* math/math_private.h: Add prototypes for __ieee754_exp2{,f,l}.
* sysdeps/libm-i387/s_exp2.S: Change name to __ieee754_exp2.
* sysdeps/libm-i387/s_exp2f.S: Likewise.
* sysdeps/libm-i387/s_exp2l.S: Likewise.
* sysdeps/libm-ieee754/k_standard.c: Add error cases for exp2.
* string/bits/string2.h (__strcpy_small): Optimize.
(__stpcpy_small): Likewise.
(strncpy): Use variable for dest argument since it's used more than
once.
(strncat): Likewise.
(strcmp): Add optimization for this function.
* sysdeps/i386/i486/string.h (strlen): Correctly use __builtin_strlen.
(__strcpy_small): Optimize.
(__stpcpy_small): Likewise.
(__stpcpy_c): Correctly use __mempcpy_* macros.
(__mempcpy_by2, __mempcpy_by4, __mempcpy_byn): Return pointer to
byte following last copied.
(strncat): Use variable for dest argument since it's used more than
once.
(strcmp): Add optimization for this function.
* sysdeps/i386/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Use
.text and .previous to select correct section.
1997-09-23 19:56 Philip Blundell <Philip.Blundell@pobox.com>
* configure.in: Add `--disable-versioning' option to suppress the
use of symbol versions even if binutils claims to support it.
1997-09-24 20:10 Philip Blundell <Philip.Blundell@pobox.com>
* csu/Makefile (before-compile): Don't try to build abi-tags.h if
not using ELF.
1997-09-21 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/sofini.c [HAVE_DWARF2_UNWIND_INFO]: Supply termination for
the frame unwind info section.
* elf/soinit.c [HAVE_DWARF2_UNWIND_INFO]: Register and unregister
the frame unwind info.
* config.h.in (HAVE_DWARF2_UNWIND_INFO): Add #undef.
* configure.in: Check whether gcc supports DWARF2 unwind info.
* libc.map: Export frame handling tables.
1997-09-10 06:56 Geoff Keating <geoffk@ozemail.com.au>
* sysdeps/unix/sysv/linux/powerpc/bits/kernel_termios.h:
Use the size of the kernel's termios structure for ioctls.
* sysdeps/powerpc/dl-machine.h: Prepare for library profiling.
* sysdeps/powerpc/bits/mathinline.h: Add slightly slower versions
of the C9X FP comparison macros. Delete 'fabs' and 'sqrt' inline
routines, because gcc has them as internals.
* sysdeps/powerpc/Makefile (pic-ccflags): Define this instead of
CFLAGS-.os.
* sysdeps/powerpc/bzero.S: New file.
* sysdeps/powerpc/strcat.c: New file.
* sysdeps/powerpc/strcpy.S: New file.
* sysdeps/powerpc/stpcpy.S: New file.
* math/Makefile: Add atest_exp2, test-reduce.
* math/atest_exp2.c: New file.
* math/test-reduce.c: New file.
* sysdeps/libm-ieee754/Dist: New file.
* sysdeps/libm-ieee754/s_exp2.c: New file.
* sysdeps/libm-ieee754/s_exp2f.c: New file.
* sysdeps/libm-ieee754/t_exp2.h: New file.
* sysdeps/libm-ieee754/t_exp2f.h: New file.
* math/libm-test.c (exp2_test): Add some more tests.
* Rules: Use empty.os instead of empty.o, since it gets linked into
libc.so...
* configure.in: Add --disable-static to disable building .a files.
* config.make.in: Substitute the new variable.
* Makeconfig: Don't build .o files if not building .a files.
* elf/dl-runtime.c (fixup): Factor out call to elf_machine_relplt.
(profile_fixup): Likewise.
1997-09-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/globtest.c (main): Change to directory passed as first
argument.
* posix/globtest.sh: Don't cd before running the program, instead
pass testdir as argument, so that $common_objpfx remains valid.
1997-09-23 18:01 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nis_call.c (__do_niscall2): Fix multiple Server support.
* nis/nis_findserver.c: Save latest working sockaddr_in.
1997-09-17 22:07 Zack Weinberg <zack@rabi.phys.columbia.edu>
* configure.in: Automatically determine whether as and ld are the
GNU versions.
(options): --with-gnu-{as,ld,binutils} replaced by
single option --with-binutils=PATH specifying a -B option to gcc.
* aclocal.m4: Two new macros defined, LIBC_PROG_FOO_GNU and
LIBC_PROG_BINUTILS.
* configure.in: Allow the user to force configuration for
unsupported platforms with an undocumented option.
1997-09-22 16:55 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* sunrpc/get_myaddr.c (get_myaddress): Avoid loopback interfaces,
return loopback address only if there is no other interface.
* nis/Makefile: Add nis_callback libnsl-routines.
* nis/nis_add.c: Use new __do_niscall* interface.
* nis/nis_cache.c: Likewise.
* nis/nis_checkpoint.c: Likewise.
* nis/nis_lookup.c: Likewise.
* nis/nis_mkdir.c: Likewise.
* nis/nis_modify.c: Likewise.
* nis/nis_ping.c: Likewise.
* nis/nis_remove.c: Likewise.
* nis/nis_rmdir.c: Likewise.
* nis/nis_server.c: Likewise.
* nis/nis_util.c: Likewise.
* nis/rpcsvc/nis.h: Make C++ safe.
* nis/nss_nisplus/nisplus-publickey.c (getsecretkey): Fix use
of variables.
* nis/nis_findserv.c: Make thread safe.
* nis/nis_call.c: Add support for callback, Fix use of variables.
* nis/nis_table.c: Add support for callback, FOLLOW_PATH and
ALL_RESULTS.
* nis/nis_callback.c: New, callback functions.
* nis/nis_intern.h: Add callback declarations.
1997-09-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h: Fix logic in preprocessor directive.
(__strsep_1c, __strsep_g): Don't declare __retval as pointing to
const, to save a cast and a possible warning.
1997-09-22 04:12 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/i486/atomicity.h (exchange_and_add): Really address
memory in xadd not %1.
1997-09-21 13:56 Ulrich Drepper <drepper@cygnus.com>
* manual/maint.texi (Supported Configurations): Add SPARC64 to
list of supported platforms.
Diffstat (limited to 'nis/nis_table.c')
-rw-r--r-- | nis/nis_table.c | 234 |
1 files changed, 155 insertions, 79 deletions
diff --git a/nis/nis_table.c b/nis/nis_table.c index a3bfa2c..3efba60 100644 --- a/nis/nis_table.c +++ b/nis/nis_table.c @@ -148,7 +148,7 @@ __create_ib_request (const_nis_name name, struct ib_request *ibreq, ibreq->ibr_flags = (flags & (RETURN_RESULT | ADD_OVERWRITE | REM_MULTIPLE | MOD_SAMEOBJ | ADD_RESERVED | REM_RESERVED | - MOD_EXCLUSIVE)); + MOD_EXCLUSIVE | ALL_RESULTS)); ibreq->ibr_obj.ibr_obj_len = 0; ibreq->ibr_obj.ibr_obj_val = NULL; ibreq->ibr_cbhost.ibr_cbhost_len = 0; @@ -170,11 +170,12 @@ nis_list (const_nis_name name, u_long flags, nis_result *res = NULL; struct ib_request ibreq; int status; - int count_links = 0; /* We will only follow 16 links! */ + int count_links = 0; /* We will only follow NIS_MAXLINKS links! */ int done = 0; nis_name *names; nis_name namebuf[2] = {NULL, NULL}; int name_nr = 0; + nis_cb *cb = NULL; res = calloc (1, sizeof (nis_result)); @@ -197,95 +198,170 @@ nis_list (const_nis_name name, u_long flags, ibreq.ibr_name = strdup (names[name_nr]); } else - names = namebuf; + { + names = namebuf; + names[name_nr] = ibreq.ibr_name; + } - while (!done) + cb = NULL; + + if (flags & FOLLOW_PATH) { - memset (res, '\0', sizeof (nis_result)); + nis_result *lres; + u_long newflags = flags & ~FOLLOW_PATH; + char table_path[NIS_MAXPATH + 1]; + char *ntable, *p; + u_long done = 0, failures = 0; - 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; + memset (res, '\0', sizeof (nis_result)); - switch (res->status) + while (names[name_nr] != NULL && !done) { - 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 */ + lres = nis_lookup (names[name_nr], newflags); + if (lres == NULL || lres->status != NIS_SUCCESS) + { + res->status = lres->status; + nis_freeresult (lres); + ++name_nr; + continue; + } + + /* nis_lookup handles FOLLOW_LINKS, + so we must have a table object. */ + if (__type_of (NIS_RES_OBJECT (lres)) != TABLE_OBJ) + { + nis_freeresult (lres); + res->status = NIS_INVALIDOBJ; + break; + } + + /* Save the path, discard everything else. */ + snprintf (table_path, NIS_MAXPATH, "%s:%s", names[name_nr], + NIS_RES_OBJECT (lres)->TA_data.ta_path); + nis_freeresult (lres); + free (res); + + p = table_path; + + while (((ntable = strsep (&p, ":")) != NULL) && !done) { - /* if we hit the link limit, bail */ - if (count_links > NIS_MAXLINKS) + /* Do the job recursive here! */ + res = nis_list (name, newflags, callback, userdata); + if (res == NULL) + return NULL; + switch (res->status) { - res->status = NIS_LINKNAMEERROR; - ++done; + case NIS_SUCCESS: + case NIS_CBRESULTS: + if (!(flags & ALL_RESULTS)) + done = 1; + break; + default: + if (flags & ALL_RESULTS) + failures++; + else + done = 1; 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; + if (res->status == NIS_SUCCESS && failures) + res->status = NIS_S_SUCCESS; + if (res->status == NIS_NOTFOUND && failures) + res->status = NIS_S_NOTFOUND; 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) + } + } + else + { + if (callback != NULL) + { + cb = __nis_create_callback (callback, userdata, flags); + ibreq.ibr_cbhost.ibr_cbhost_len = 1; + ibreq.ibr_cbhost.ibr_cbhost_val = cb->serv; + } + + 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, cb); + if (status != NIS_SUCCESS) + res->status = status; + + switch (res->status) { - free (ibreq.ibr_name); - res->status = NIS_LINKNAMEERROR; + 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: + /* Calback is handled in nis_call.c (__do_niscall2). */ ++done; break; - } - ++name_nr; - if (names[name_nr] == NULL) - { + 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; } - ibreq.ibr_name = names[name_nr]; - break; } - } + } /* End of not FOLLOW_PATH. */ 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; - } + if (cb) + __nis_destroy_callback (cb); return res; } @@ -298,8 +374,8 @@ nis_add_entry (const_nis_name name, const nis_object *obj, nis_error status; struct ib_request ibreq; char *p1, *p2, *p3, *p4; - char buf1 [strlen (name) + 20]; - char buf4 [strlen (name) + 20]; + char buf1[strlen (name) + 20]; + char buf4[strlen (name) + 20]; res = calloc (1, sizeof (nis_result)); @@ -332,9 +408,9 @@ nis_add_entry (const_nis_name name, const nis_object *obj, if ((status = __do_niscall (ibreq.ibr_name, NIS_IBADD, (xdrproc_t) xdr_ib_request, - (caddr_t) &ibreq, + (caddr_t) & ibreq, (xdrproc_t) xdr_nis_result, - (caddr_t) res, 0)) != NIS_SUCCESS) + (caddr_t) res, 0, NULL)) != NIS_SUCCESS) res->status = status; ibreq.ibr_obj.ibr_obj_val->zo_name = p1; @@ -355,8 +431,8 @@ nis_modify_entry (const_nis_name name, const nis_object *obj, nis_error status; struct ib_request ibreq; char *p1, *p2, *p3, *p4; - char buf1 [strlen (name) + 20]; - char buf4 [strlen (name) + 20]; + char buf1[strlen (name) + 20]; + char buf4[strlen (name) + 20]; res = calloc (1, sizeof (nis_result)); @@ -390,7 +466,7 @@ nis_modify_entry (const_nis_name name, const nis_object *obj, 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) + (caddr_t) res, 0, NULL)) != NIS_SUCCESS) res->status = status; ibreq.ibr_obj.ibr_obj_val->zo_name = p1; @@ -429,7 +505,7 @@ nis_remove_entry (const_nis_name name, const nis_object *obj, 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) + (caddr_t) res, 0, NULL)) != NIS_SUCCESS) res->status = status; nis_free_request (&ibreq); @@ -454,8 +530,8 @@ nis_first_entry (const_nis_name name) 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) + (caddr_t) & ibreq, (xdrproc_t) xdr_nis_result, + (caddr_t) res, 0, NULL)) != NIS_SUCCESS) res->status = status; nis_free_request (&ibreq); @@ -493,8 +569,8 @@ nis_next_entry (const_nis_name name, const netobj *cookie) 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) + (caddr_t) & ibreq, (xdrproc_t) xdr_nis_result, + (caddr_t) res, 0, NULL)) != NIS_SUCCESS) res->status = status; nis_free_request (&ibreq); |