1 files changed, 153 insertions, 100 deletions

diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c
index 6cad42d4f6..50bc7e24c1 100644
--- a/nis/nss_nisplus/nisplus-service.c
+++ b/nis/nss_nisplus/nisplus-service.c
@@ -31,107 +31,154 @@
 __libc_lock_define_initialized (static, lock);
 
 static nis_result *result = NULL;
-static nis_name *names = NULL;
-
-#define ENTNAME         servent
-#define DATABASE        "services"
-#define TRAILING_LIST_MEMBER            s_aliases
-#define TRAILING_LIST_SEPARATOR_P       isspace
-#include "../../nss/nss_files/files-parse.c"
-#define ISSLASH(c) ((c) == '/')
-LINE_PARSER
-("#",
- STRING_FIELD (result->s_name, isspace, 1);
- INT_FIELD (result->s_port, ISSLASH, 10, 0, htons);
- STRING_FIELD (result->s_proto, isspace, 1);
- )
-
+static nis_name tablename_val = NULL;
+static u_long tablename_len = 0;
 
 #define NISENTRYVAL(idx,col,res) \
-  ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val)
+  ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val)
 
 #define NISENTRYLEN(idx,col,res) \
-    ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
+    ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
 
 static int
 _nss_nisplus_parse_servent (nis_result *result, struct servent *serv,
 			    char *buffer, size_t buflen)
 {
-  char *p = buffer;
+  char *first_unused = buffer;
   size_t room_left = buflen;
   unsigned int i;
-  struct parser_data *data = (void *) buffer;
+  char *p, *line;
 
   if (result == NULL)
     return 0;
 
   if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) ||
-      result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ ||
-   strcmp (result->objects.objects_val[0].zo_data.objdata_u.en_data.en_type,
-	   "services_tbl") != 0 ||
-      result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
+      __type_of (result->objects.objects_val) != ENTRY_OBJ ||
+      strcmp (result->objects.objects_val->EN_data.en_type,
+	      "services_tbl") != 0 ||
+      result->objects.objects_val->EN_data.en_cols.en_cols_len < 4)
     return 0;
 
-  memset (p, '\0', room_left);
-
-  /* Generate the services entry format and use the normal parser */
-  if (NISENTRYLEN (0, 0, result) + 1 > room_left)
+  if (NISENTRYLEN (0, 0, result) >= room_left)
     {
+    no_more_room:
       __set_errno (ERANGE);
       return 0;
     }
-  strncpy (p, NISENTRYVAL (0, 0, result), NISENTRYLEN (0, 0, result));
-  room_left -= (NISENTRYLEN (0, 0, result) + 1);
-
-  if (NISENTRYLEN (0, 3, result) + 1 > room_left)
+  strncpy (first_unused, NISENTRYVAL (0, 0, result),
+           NISENTRYLEN (0, 0, result));
+  first_unused[NISENTRYLEN (0, 0, result)] = '\0';
+  serv->s_name = first_unused;
+  room_left -= (strlen (first_unused) +1);
+  first_unused += strlen (first_unused) +1;
+
+  if (NISENTRYLEN (0, 2, result) >= room_left)
+    goto no_more_room;
+  strncpy (first_unused, NISENTRYVAL (0, 2, result),
+           NISENTRYLEN (0, 2, result));
+  first_unused[NISENTRYLEN (0, 2, result)] = '\0';
+  serv->s_proto = first_unused;
+  room_left -= (strlen (first_unused) +1);
+  first_unused += strlen (first_unused) +1;
+
+  serv->s_port = atoi (NISENTRYVAL (0, 3, result));
+  p = first_unused;
+
+  line = p;
+  for (i = 0; i < result->objects.objects_len; i++)
     {
-      __set_errno (ERANGE);
-      return 0;
+      if (strcmp (NISENTRYVAL (i, 1, result), serv->s_name) != 0)
+        {
+          if (NISENTRYLEN (i, 1, result) + 2 > room_left)
+            goto no_more_room;
+          p = stpcpy(p, " ");
+          p = stpncpy (p, NISENTRYVAL (i, 1, result),
+                       NISENTRYLEN (i, 1, result));
+          *p = '\0';
+          room_left -= (NISENTRYLEN (i, 1, result) + 1);
+        }
     }
-  strcat (p, "\t");
-  strncat (p, NISENTRYVAL (0, 3, result), NISENTRYLEN (0, 3, result));
-  room_left -= (NISENTRYLEN (0, 3, result) + 1);
-  if (NISENTRYLEN (0, 2, result) + 1 > room_left)
+  ++p;
+  first_unused = p;
+
+  /* Adjust the pointer so it is aligned for
+     storing pointers.  */
+  first_unused += __alignof__ (char *) - 1;
+  first_unused -= ((first_unused - (char *) 0) % __alignof__ (char *));
+  serv->s_aliases = (char **) first_unused;
+  if (room_left < sizeof (char *))
+    goto no_more_room;
+  room_left -= (sizeof (char *));
+  serv->s_aliases[0] = NULL;
+
+  i = 0;
+  while (*line != '\0')
     {
-      __set_errno (ERANGE);
-      return 0;
-    }
-  strcat (p, "/");
-  strncat (p, NISENTRYVAL (0, 2, result), NISENTRYLEN (0, 2, result));
-  room_left -= (NISENTRYLEN (0, 2, result) + 1);
+      /* Skip leading blanks.  */
+      while (isspace (*line))
+        line++;
 
-  for (i = 1; i < result->objects.objects_len; i++)
-    {
-      if (NISENTRYLEN (i, 1, result) + 1 > room_left)
-	{
-	  __set_errno (ERANGE);
-	  return 0;
+      if (*line == '\0')
+        break;
+
+      if (room_left < sizeof (char *))
+        goto no_more_room;
+
+      room_left -= sizeof (char *);
+      serv->s_aliases[i] = line;
+
+      while (*line != '\0' && *line != ' ')
+        ++line;
+
+      if (*line == ' ')
+        {
+	  *line = '\0';
+	  ++line;
+          ++i;
 	}
-      strcat (p, " ");
-      strcat (p, NISENTRYVAL (i, 1, result));
-      room_left -= (NISENTRYLEN (i, 1, result) + 1);
+      else
+        serv->s_aliases[i+1] = NULL;
     }
 
-  return _nss_files_parse_servent (p, serv, data, buflen);
+  return 1;
+}
+
+static enum nss_status
+_nss_create_tablename (void)
+{
+  if (tablename_val == NULL)
+    {
+      char buf [40 + strlen (nis_local_directory ())];
+      char *p;
+
+      p = stpcpy (buf, "services.org_dir.");
+      p = stpcpy (p, nis_local_directory ());
+      tablename_val = strdup (buf);
+      if (tablename_val == NULL)
+        return NSS_STATUS_TRYAGAIN;
+      tablename_len = strlen (tablename_val);
+    }
+  return NSS_STATUS_SUCCESS;
 }
 
+
 enum nss_status
 _nss_nisplus_setservent (void)
 {
+  enum nss_status status = NSS_STATUS_SUCCESS;
+
   __libc_lock_lock (lock);
 
   if (result)
     nis_freeresult (result);
   result = NULL;
-  if (names)
-    {
-      nis_freenames (names);
-      names = NULL;
-    }
+
+  if (tablename_val == NULL)
+    status = _nss_create_tablename ();
 
   __libc_lock_unlock (lock);
 
-  return NSS_STATUS_SUCCESS;
+  return status;
 }
 
 enum nss_status
@@ -142,11 +189,6 @@ _nss_nisplus_endservent (void)
   if (result)
     nis_freeresult (result);
   result = NULL;
-  if (names)
-    {
-      nis_freenames (names);
-      names = NULL;
-    }
 
   __libc_lock_unlock (lock);
 
@@ -164,11 +206,11 @@ internal_nisplus_getservent_r (struct servent *serv, char *buffer,
     {
       if (result == NULL)
 	{
-	  names = nis_getnames ("services.org_dir");
-	  if (names == NULL || names[0] == NULL)
-	    return NSS_STATUS_UNAVAIL;
+          if (tablename_val == NULL)
+            if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+              return NSS_STATUS_UNAVAIL;
 
-	  result = nis_first_entry (names[0]);
+	  result = nis_first_entry (tablename_val);
 	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
 	    return niserr2nss (result->status);
 	}
@@ -176,7 +218,7 @@ internal_nisplus_getservent_r (struct servent *serv, char *buffer,
 	{
 	  nis_result *res;
 
-	  res = nis_next_entry (names[0], &result->cookie);
+	  res = nis_next_entry (tablename_val, &result->cookie);
 	  nis_freeresult (result);
 	  result = res;
 	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
@@ -212,6 +254,10 @@ _nss_nisplus_getservbyname_r (const char *name, const char *protocol,
 {
   int parse_res;
 
+  if (tablename_val == NULL)
+    if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+      return NSS_STATUS_UNAVAIL;
+
   if (name == NULL || protocol == NULL)
     {
       __set_errno (EINVAL);
@@ -220,29 +266,30 @@ _nss_nisplus_getservbyname_r (const char *name, const char *protocol,
   else
     {
       nis_result *result;
-      char buf[strlen (name) + 255];
+      char buf[strlen (name) + 255 + tablename_len];
 
       /* Search at first in the alias list, and use the correct name
          for the next search */
-      sprintf (buf, "[name=%s,proto=%s],services.org_dir", name,
-	       protocol);
-      result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+      sprintf (buf, "[name=%s,proto=%s],%s", name, protocol,
+	       tablename_val);
+      result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 
       /* If we do not find it, try it as original name. But if the
          database is correct, we should find it in the first case, too */
       if ((result->status != NIS_SUCCESS &&
 	   result->status != NIS_S_SUCCESS) ||
-	  result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ ||
-	  strcmp (result->objects.objects_val[0].zo_data.objdata_u.en_data.en_type,
+	  __type_of (result->objects.objects_val) != ENTRY_OBJ ||
+	  strcmp (result->objects.objects_val->EN_data.en_type,
 		  "services_tbl") != 0 ||
-	  result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 4)
-	sprintf (buf, "[cname=%s,proto=%s],services.org_dir", name, protocol);
+	  result->objects.objects_val->EN_data.en_cols.en_cols_len < 4)
+	sprintf (buf, "[cname=%s,proto=%s],%s", name, protocol,
+		 tablename_val);
       else
-	sprintf (buf, "[cname=%s,proto=%s],services.org_dir",
-		 NISENTRYVAL (0, 0, result), protocol);
+	sprintf (buf, "[cname=%s,proto=%s],%s",
+		 NISENTRYVAL (0, 0, result), protocol, tablename_val);
 
       nis_freeresult (result);
-      result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+      result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 
       if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
 	{
@@ -271,38 +318,44 @@ _nss_nisplus_getservbynumber_r (const int number, const char *protocol,
 				struct servent *serv,
 				char *buffer, size_t buflen)
 {
-  int parse_res;
-  nis_result *result;
-  char buf[60 + strlen (protocol)];
+  if (tablename_val == NULL)
+    if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+      return NSS_STATUS_UNAVAIL;
 
   if (protocol == NULL)
     {
       __set_errno (EINVAL);
       return NSS_STATUS_NOTFOUND;
     }
+  else
+    {
+      int parse_res;
+      nis_result *result;
+      char buf[60 + strlen (protocol) + tablename_len];
 
-  snprintf (buf, sizeof (buf), "[number=%d,proto=%s],services.org_dir",
-	    number, protocol);
+      snprintf (buf, sizeof (buf), "[number=%d,proto=%s],%s",
+		number, protocol, tablename_val);
 
-  result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+      result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 
-  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
-    {
-      enum nss_status status = niserr2nss (result->status);
+      if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+	{
+	  enum nss_status status = niserr2nss (result->status);
 
-      nis_freeresult (result);
-      return status;
-    }
+	  nis_freeresult (result);
+	  return status;
+	}
 
-  parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
+      parse_res = _nss_nisplus_parse_servent (result, serv, buffer, buflen);
 
-  nis_freeresult (result);
+      nis_freeresult (result);
 
-  if (parse_res)
-    return NSS_STATUS_SUCCESS;
+      if (parse_res)
+	return NSS_STATUS_SUCCESS;
 
-  if (!parse_res && errno == ERANGE)
-    return NSS_STATUS_TRYAGAIN;
-  else
-    return NSS_STATUS_NOTFOUND;
+      if (!parse_res && errno == ERANGE)
+	return NSS_STATUS_TRYAGAIN;
+      else
+	return NSS_STATUS_NOTFOUND;
+    }
 }