summaryrefslogtreecommitdiff
path: root/nis/nss_nis/nis-ethers.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-03-09 06:16:49 +0000
committerUlrich Drepper <drepper@redhat.com>1997-03-09 06:16:49 +0000
commitf166d8653042df4b840c4d56fba752e266c8bffb (patch)
tree0e7d891c1389559e02e468431b625bbb92b2c61f /nis/nss_nis/nis-ethers.c
parent4cca6b868f08e4f95a4c3786a69135676b086c50 (diff)
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-ethers.c')
-rw-r--r--nis/nss_nis/nis-ethers.c143
1 files changed, 87 insertions, 56 deletions
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index d257cd7e4b..c6656ee05f 100644
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -43,43 +43,101 @@ struct ether
#define EXTERN_PARSER
#include "../nss/nss_files/files-parse.c"
-static bool_t new_start = 1;
-static char *oldkey = NULL;
-static int oldkeylen = 0;
+struct response
+{
+ char *val;
+ struct response *next;
+};
-enum nss_status
-_nss_nis_setetherent (void)
+static struct response *start = NULL;
+static struct response *next = NULL;
+
+static int
+saveit (int instatus, char *inkey, int inkeylen, char *inval,
+ int invallen, char *indata)
{
- __libc_lock_lock (lock);
+ if (instatus != YP_TRUE)
+ return instatus;
- new_start = 1;
- if (oldkey != NULL)
+ if (inkey && inkeylen > 0 && inval && invallen > 0)
{
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
+ if (start == NULL)
+ {
+ start = malloc (sizeof (struct response));
+ next = start;
+ }
+ else
+ {
+ next->next = malloc (sizeof (struct response));
+ next = next->next;
+ }
+ next->next = NULL;
+ next->val = malloc (invallen + 1);
+ strncpy (next->val, inval, invallen);
+ next->val[invallen] = '\0';
}
+
+ return 0;
+}
- __libc_lock_unlock (lock);
+enum nss_status
+internal_nis_setetherent (void)
+{
+ char *domainname;
+ struct ypall_callback ypcb;
+
+ yp_get_default_domain(&domainname);
+
+ while (start != NULL)
+ {
+ if (start->val != NULL)
+ free (start->val);
+ next = start;
+ start = start->next;
+ free (next);
+ }
+ start = NULL;
+
+ ypcb.foreach = saveit;
+ ypcb.data = NULL;
+ yp_all(domainname, "ethers.byname", &ypcb);
+ next = start;
return NSS_STATUS_SUCCESS;
}
enum nss_status
+_nss_nis_setetherent (void)
+{
+ enum nss_status result;
+
+ __libc_lock_lock (lock);
+
+ result = internal_nis_setetherent ();
+
+ __libc_lock_unlock (lock);
+
+ return result;
+}
+
+enum nss_status
_nss_nis_endetherent (void)
{
__libc_lock_lock (lock);
- new_start = 1;
- if (oldkey != NULL)
+ while (start != NULL)
{
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
+ if (start->val != NULL)
+ free (start->val);
+ next = start;
+ start = start->next;
+ free (next);
}
-
+ start = NULL;
+ next = NULL;
+
__libc_lock_unlock (lock);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -87,54 +145,27 @@ static enum nss_status
internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen)
{
struct parser_data *data = (void *) buffer;
- char *domain, *result, *outkey;
- int len, keylen, parse_res;
+ int parse_res;
- if (yp_get_default_domain (&domain))
- return NSS_STATUS_UNAVAIL;
+ if (start == NULL)
+ internal_nis_setetherent ();
/* Get the next entry until we found a correct one. */
do
{
- enum nss_status retval;
char *p;
-
- if (new_start)
- retval = yperr2nss (yp_first (domain, "ethers.byaddr",
- &outkey, &keylen, &result, &len));
- else
- retval = yperr2nss ( yp_next (domain, "ethers.byaddr",
- oldkey, 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 (next == NULL)
+ return NSS_STATUS_NOTFOUND;
+ p = strcpy (buffer, next->val);
+ next = next->next;
+
while (isspace (*p))
++p;
- free (result);
-
+
parse_res = _nss_files_parse_etherent (p, eth, data, buflen);
if (!parse_res && errno == ERANGE)
return NSS_STATUS_TRYAGAIN;
-
- free (oldkey);
- oldkey = outkey;
- oldkeylen = keylen;
- new_start = 0;
}
while (!parse_res);