diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-03-09 06:16:49 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-09 06:16:49 +0000 |
commit | f166d8653042df4b840c4d56fba752e266c8bffb (patch) | |
tree | 0e7d891c1389559e02e468431b625bbb92b2c61f /nis/nss_nis/nis-rpc.c | |
parent | 4cca6b868f08e4f95a4c3786a69135676b086c50 (diff) | |
download | glibc-f166d8653042df4b840c4d56fba752e266c8bffb.tar.gz glibc-f166d8653042df4b840c4d56fba752e266c8bffb.tar.xz glibc-f166d8653042df4b840c4d56fba752e266c8bffb.zip |
Update.
1997-03-09 06:59 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Add ASFLAGS-% flags for SPARC assembler which need -fPIC. * Makerules (compile.S): Use ASFLAGS-%. (COMPILE.S): Likewise. * config.make.in (ASFLAGS-.so): Define from ASFLAGS_SO. * configure.in: Substitute ASFLAGS_SO. * sysdeps/sparc/configure.in: New file. * posix/unitstd.h: Add prototype for __euidaccess. * sysdeps/posix/euidaccess.c: Define as __euidaccess and make euidaccess weak alias. * sysdeps/stubs/euidaccess.c: Likewise. * inet/rcmd.c: Use __ protected versions of non-standard functions. * locale/setlocale.c (setlocale): Don't set usage_count to MAX_USAGE_COUNT if it already has this value. * locale/programs/localedef.c: Don't use LOCALE_PATH to find binary locale files. Use LOCALEDIR only. * locale/programs/locfile.c: When named file not found and not absolute use path in I18NPATH. * stdlib/Makefile (headers): Add inttypes.h. * sysdpes/generic/socketbits.h: Add PF_FILE as synonym for PF_LOCAL and AF_FILE as synonym for AF_LOCAL. * sysdpes/unix/sysv/linux/socketbits.h: Likewise. * time/Makefile: Rewrite rules for test to handle parallel builds. 1997-03-09 05:26 Ulrich Drepper <drepper@cygnus.com> * manual/startup.texi (EXIT_FAILURE): Fix typo. Patch by robbe@orcus.priv.at. 1997-03-09 05:10 Edward Seidl <seidl@janed.com> * sysdeps/i386/elf/start.S (nofini): *Really* align stack to 8-byte boundary. 1997-03-09 01:48 Ulrich Drepper <drepper@cygnus.com> * elf/link.h: Define __need_NULL to get definition. Include <features.h>. Patch by Andreas Jaeger <aj@arthur.pfalz.de>. 1997-03-08 21:48 Thorsten Kukuk <kukuk@tk.uni-paderborn.de> Rewrite NIS code to allow empty keys. * nis/nss_nis/nis-ethers.c: Rewritten. * nis/nss_nis/nis-proto.c: Rewritten. * nis/nss_nis/nis-publickey.c: Rewritten. * nis/nss_nis/nis-rpc.c: Rewritten. * nis/nss_nis/nis-service.c: Rewritten. 1997-03-08 16:02 Andreas Jaeger <aj@arthur.pfalz.de> * time/scheck.c (scheck): Add extra const to second argument. * time/private.h: Correct prototypes to match definition. 1997-03-08 18:55 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/__math.h: Remove cabs inline definition. Reported by Philip Blundell <pjb27@cam.ac.uk>. Reported by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>. Bug report by Andreas Jaeger <jaeger@informatik.uni-kl.de>.
Diffstat (limited to 'nis/nss_nis/nis-rpc.c')
-rw-r--r-- | nis/nss_nis/nis-rpc.c | 142 |
1 files changed, 81 insertions, 61 deletions
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c index 2dae9ea8fa..c0e21d83da 100644 --- a/nis/nss_nis/nis-rpc.c +++ b/nis/nss_nis/nis-rpc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996. @@ -35,26 +35,75 @@ __libc_lock_define_initialized (static, lock) +struct response_t +{ + char *val; + struct response_t *next; +}; + struct intern_t { - bool_t new_start; - char *oldkey; - int oldkeylen; + struct response_t *start; + struct response_t *next; }; typedef struct intern_t intern_t; -static intern_t intern = {TRUE, NULL, 0}; +static intern_t intern = {NULL, NULL}; + +static int +saveit (int instatus, char *inkey, int inkeylen, char *inval, + int invallen, char *indata) +{ + intern_t *intern = (intern_t *)indata; + + if (instatus != YP_TRUE) + return instatus; + + if (inkey && inkeylen > 0 && inval && invallen > 0) + { + if (intern->start == NULL) + { + intern->start = malloc (sizeof (struct response_t)); + intern->next = intern->start; + } + else + { + intern->next->next = malloc (sizeof (struct response_t)); + intern->next = intern->next->next; + } + intern->next->next = NULL; + intern->next->val = malloc (invallen + 1); + strncpy (intern->next->val, inval, invallen); + intern->next->val[invallen] = '\0'; + } + + return 0; +} static enum nss_status -internal_nis_setrpcent (intern_t *data) +internal_nis_setrpcent (intern_t *intern) { - data->new_start = 1; - if (data->oldkey != NULL) + char *domainname; + struct ypall_callback ypcb; + + if (yp_get_default_domain (&domainname)) + return NSS_STATUS_UNAVAIL; + + while (intern->start != NULL) { - free (data->oldkey); - data->oldkey = NULL; - data->oldkeylen = 0; + if (intern->start->val != NULL) + free (intern->start->val); + intern->next = intern->start; + intern->start = intern->start->next; + free (intern->next); } + intern->start = NULL; + + ypcb.foreach = saveit; + ypcb.data = (char *)intern; + yp_all(domainname, "rpc.bynumber", &ypcb); + intern->next = intern->start; + return NSS_STATUS_SUCCESS; } @@ -73,15 +122,18 @@ _nss_nis_setrpcent (void) } static enum nss_status -internal_nis_endrpcent (intern_t *data) +internal_nis_endrpcent (intern_t *intern) { - data->new_start = 1; - if (data->oldkey != NULL) + while (intern->start != NULL) { - free (data->oldkey); - data->oldkey = NULL; - data->oldkeylen = 0; + if (intern->start->val != NULL) + free (intern->start->val); + intern->next = intern->start; + intern->start = intern->start->next; + free (intern->next); } + intern->start = NULL; + return NSS_STATUS_SUCCESS; } @@ -104,60 +156,28 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen, intern_t *data) { struct parser_data *pdata = (void *) buffer; - char *domain; - char *result; - int len, parse_res; - char *outkey; - int keylen; + int parse_res; char *p; - - if (yp_get_default_domain (&domain)) - return NSS_STATUS_UNAVAIL; - + + if (data->start == NULL) + internal_nis_setrpcent (data); + /* Get the next entry until we found a correct one. */ do { - enum nss_status retval; - - if (data->new_start) - retval = yperr2nss (yp_first (domain, "rpc.bynumber", - &outkey, &keylen, &result, &len)); - else - retval = yperr2nss ( yp_next (domain, "rpc.bynumber", - data->oldkey, data->oldkeylen, - &outkey, &keylen, &result, &len)); - - if (retval != NSS_STATUS_SUCCESS) - { - if (retval == NSS_STATUS_TRYAGAIN) - __set_errno (EAGAIN); - return retval; - } - - if ((size_t) (len + 1) > buflen) - { - free (result); - __set_errno (ERANGE); - return NSS_STATUS_TRYAGAIN; - } - - p = strncpy (buffer, result, len); - buffer[len] = '\0'; + if (data->next == NULL) + return NSS_STATUS_NOTFOUND; + p = strcpy (buffer, data->next->val); + data->next = data->next->next; while (isspace (*p)) ++p; - free (result); - + parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; - - free (data->oldkey); - data->oldkey = outkey; - data->oldkeylen = keylen; - data->new_start = 0; } while (!parse_res); - + return NSS_STATUS_SUCCESS; } @@ -179,7 +199,7 @@ enum nss_status _nss_nis_getrpcbyname_r (const char *name, struct rpcent *rpc, char *buffer, size_t buflen) { - intern_t data = {TRUE, NULL, 0}; + intern_t data = {NULL, NULL}; enum nss_status status; int found; |