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>.

5 files changed, 353 insertions, 245 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);
 
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index ccb95c3c41..3349fe5b36 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.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,81 @@
 
 __libc_lock_define_initialized (static, lock)
 
-static bool_t new_start = 1;
-static char *oldkey = NULL;
-static int oldkeylen = 0;
+struct response
+{
+  char *val;
+  struct response *next;
+};
+
+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)
+{
+  if (instatus != YP_TRUE)
+    return instatus;
+
+  if (inkey && inkeylen > 0 && inval && invallen > 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;
+}
+
+enum nss_status
+internal_nis_setprotoent (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, "protocols.bynumber", &ypcb);
+  next = start;
+  
+  return NSS_STATUS_SUCCESS;
+}
 
 enum nss_status
 _nss_nis_setprotoent (void)
 {
+  enum nss_status status;
+
   __libc_lock_lock (lock);
 
-  new_start = 1;
-  if (oldkey != NULL)
-    {
-      free (oldkey);
-      oldkey = NULL;
-      oldkeylen = 0;
-    }
+  status = internal_nis_setprotoent ();
 
   __libc_lock_unlock (lock);
 
-  return NSS_STATUS_SUCCESS;
+  return status;
 }
 
 enum nss_status
@@ -62,16 +117,19 @@ _nss_nis_endprotoent (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;
 }
 
@@ -80,57 +138,30 @@ internal_nis_getprotoent_r (struct protoent *proto,
 			    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_setprotoent ();
 
   /* 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, "protocols.bynumber",
-                                      &outkey, &keylen, &result, &len));
-      else
-        retval = yperr2nss ( yp_next (domain, "protocols.bynumber",
-                                      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_protoent (p, proto, data, buflen);
       if (!parse_res && errno == ERANGE)
         return NSS_STATUS_TRYAGAIN;
-
-      free (oldkey);
-      oldkey = outkey;
-      oldkeylen = keylen;
-      new_start = 0;
     }
   while (!parse_res);
-
+  
   return NSS_STATUS_SUCCESS;
 }
 
diff --git a/nis/nss_nis/nis-publickey.c b/nis/nss_nis/nis-publickey.c
index b9eda6a742..aad4da5cc2 100644
--- a/nis/nss_nis/nis-publickey.c
+++ b/nis/nss_nis/nis-publickey.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.
 
@@ -130,6 +130,7 @@ parse_netid_str (const char *s, uid_t *uidp, gid_t *gidp, int *gidlenp,
 		 gid_t *gidlist)
 {
   char *p;
+  int gidlen;
 
   if (!s || !isdigit (*s))
     {
@@ -162,14 +163,15 @@ parse_netid_str (const char *s, uid_t *uidp, gid_t *gidp, int *gidlenp,
 
   *gidp = (atoi (p));
 
-  *gidlenp = 0;
-#if 0
+  gidlen = 0;
+
   while ((p = strchr (p, ',')) != NULL)
     {
       p++;
-      gidlist[*gidlenp++] = atoi (p);
+      gidlist[gidlen++] = atoi (p);
     }
-#endif
+
+  *gidlenp = gidlen;
 
   return NSS_STATUS_SUCCESS;
 }
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;
 
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index 6d07479ee2..46c3364fe3 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.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.
 
@@ -37,26 +37,75 @@ extern int _nss_files_parse_servent (char *line, struct servent *result,
 
 __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_setservent (intern_t * intern)
+internal_nis_setservent (intern_t *intern)
 {
-  intern->new_start = 1;
-  if (intern->oldkey != NULL)
+  char *domainname;
+  struct ypall_callback ypcb;
+  
+  if (yp_get_default_domain (&domainname))
+    return NSS_STATUS_UNAVAIL;
+  
+  while (intern->start != NULL)
     {
-      free (intern->oldkey);
-      intern->oldkey = NULL;
-      intern->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, "services.byname", &ypcb);
+  intern->next = intern->start;
+
   return NSS_STATUS_SUCCESS;
 }
 enum nss_status
@@ -76,13 +125,16 @@ _nss_nis_setservent (void)
 static enum nss_status
 internal_nis_endservent (intern_t * intern)
 {
-  intern->new_start = 1;
-  if (intern->oldkey != NULL)
+  while (intern->start != NULL)
     {
-      free (intern->oldkey);
-      intern->oldkey = NULL;
-      intern->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,57 +156,25 @@ static enum nss_status
 internal_nis_getservent_r (struct servent *serv, char *buffer,
 			   size_t buflen, intern_t *data)
 {
-  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_setservent (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, "services.byname",
-                                      &outkey, &keylen, &result, &len));
-      else
-        retval = yperr2nss ( yp_next (domain, "services.byname",
-                                      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_servent (p, serv, buffer, 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);
 
@@ -179,7 +199,7 @@ enum nss_status
 _nss_nis_getservbyname_r (const char *name, char *protocol,
 			  struct servent *serv, char *buffer, size_t buflen)
 {
-  intern_t data = {TRUE, NULL, 0};
+  intern_t data = {NULL, NULL};
   enum nss_status status;
   int found;
 
@@ -198,15 +218,19 @@ _nss_nis_getservbyname_r (const char *name, char *protocol,
          ((status = internal_nis_getservent_r (serv, buffer, buflen, &data))
           == NSS_STATUS_SUCCESS))
     {
-      if (strcmp (serv->s_name, name) == 0)
-        {
-          if (strcmp (serv->s_proto, protocol) == 0)
-            {
-              found = 1;
-            }
-        }
+      if (strcmp (serv->s_proto, protocol) == 0)
+	{
+	  char **cp;
+	  
+	  if (strcmp (serv->s_name, name) == 0)
+	    found = 1;
+	  else
+	    for (cp = serv->s_aliases; *cp; cp++)
+	      if (strcmp(name, *cp) == 0)
+		found = 1;
+	}
     }
-
+  
   internal_nis_endservent (&data);
 
   if (!found && status == NSS_STATUS_SUCCESS)
@@ -219,7 +243,7 @@ enum nss_status
 _nss_nis_getservbyport_r (int port, char *protocol, struct servent *serv,
 			  char *buffer, size_t buflen)
 {
-  intern_t data = {TRUE, NULL, 0};
+  intern_t data = {NULL, NULL};
   enum nss_status status;
   int found;