Rewrite NIS code to allow empty keys.

Don't ignore return value of yp_all.

nis/nss_nis/nis-ethers.c

@@ -43,26 +43,82 @@ 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;
+};
+
+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_setetherent (void)
+{
+  char *domainname;
+  struct ypall_callback ypcb;
+  enum nss_status status;
+
+  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;
+  status = yperr2nss (yp_all (domainname, "ethers.byname", &ypcb));
+  next = start;
+
+  return status;
+}
 
 enum nss_status
 _nss_nis_setetherent (void)
 {
+  enum nss_status result;
+
   __libc_lock_lock (lock);
 
-  new_start = 1;
-  if (oldkey != NULL)
-    {
-      free (oldkey);
-      oldkey = NULL;
-      oldkeylen = 0;
-    }
+  result = internal_nis_setetherent ();
 
   __libc_lock_unlock (lock);
 
-  return NSS_STATUS_SUCCESS;
+  return result;
 }
 
 enum nss_status
@@ -70,13 +126,16 @@ _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);
 
@@ -87,54 +146,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 (next == NULL)
+	return NSS_STATUS_NOTFOUND;
+      p = strcpy (buffer, next->val);
+      next = next->next;
 
-      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';
       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);
 

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,82 @@
 
 __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;
+  enum nss_status status;
+  
+  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;
+  status = yperr2nss (yp_all (domainname, "protocols.bynumber", &ypcb));
+  next = start;
+  
+  return status;
+}
 
 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 +118,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 +139,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;
 }
 

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,27 +35,77 @@
 
 __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;
+  enum nss_status status;
+  
+  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);
     }
-  return NSS_STATUS_SUCCESS;
+  intern->start = NULL;
+
+  ypcb.foreach = saveit;
+  ypcb.data = (char *)intern;
+  status = yperr2nss (yp_all(domainname, "rpc.bynumber", &ypcb));
+  intern->next = intern->start;
+
+  return status;
 }
 
 enum nss_status
@@ -73,15 +123,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 +157,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 +200,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;
 

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,27 +37,77 @@ 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;
+  enum nss_status status;
+
+  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);
     }
-  return NSS_STATUS_SUCCESS;
+  intern->start = NULL;
+
+  ypcb.foreach = saveit;
+  ypcb.data = (char *) intern;
+  status = yperr2nss (yp_all (domainname, "services.byname", &ypcb));
+  intern->next = intern->start;
+
+  return status;
 }
 enum nss_status
 _nss_nis_setservent (void)
@@ -76,13 +126,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 +157,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 +200,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,13 +219,17 @@ _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);
@@ -219,7 +244,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;