1 files changed, 143 insertions, 87 deletions

diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c
index 180e9169f2..cebd5d7183 100644
--- a/nis/nss_nisplus/nisplus-rpc.c
+++ b/nis/nss_nisplus/nisplus-rpc.c
@@ -31,98 +31,148 @@
 __libc_lock_define_initialized (static, lock)
 
 static nis_result *result = NULL;
-static nis_name *names = NULL;
-
-#define ENTNAME         rpcent
-#define DATABASE        "rpc"
-#define TRAILING_LIST_MEMBER            r_aliases
-#define TRAILING_LIST_SEPARATOR_P       isspace
-#include "../../nss/nss_files/files-parse.c"
-LINE_PARSER
-("#",
- STRING_FIELD (result->r_name, isspace, 1);
- INT_FIELD (result->r_number, isspace, 1, 10,);
- )
+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_rpcent (nis_result *result, struct rpcent *rpc,
 			   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,
+      __type_of (result->objects.objects_val) != ENTRY_OBJ ||
+      strcmp(result->objects.objects_val[0].EN_data.en_type,
              "rpc_tbl") != 0 ||
-      result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 3)
+      result->objects.objects_val[0].EN_data.en_cols.en_cols_len < 3)
     return 0;
 
-  memset (p, '\0', room_left);
-
-  /* Generate the rpc 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, 2, result) +1 > room_left)
+  strncpy (first_unused, NISENTRYVAL (0, 0, result),
+           NISENTRYLEN (0, 0, result));
+  first_unused[NISENTRYLEN (0, 0, result)] = '\0';
+  rpc->r_name = first_unused;
+  room_left -= (strlen (first_unused) +1);
+  first_unused += strlen (first_unused) +1;
+  rpc->r_number = atoi (NISENTRYVAL (0, 2, 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), rpc->r_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, 2, result), NISENTRYLEN (0, 2, result));
-  room_left -= (NISENTRYLEN (0, 2, result) + 1);
-                                       /* + 1: We overwrite the last \0 */
-
-  for (i = 0; i < result->objects.objects_len; i++)
-    /* XXX should we start with i = 0 or with i = 1 ? */
+  ++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 *));
+  rpc->r_aliases = (char **) first_unused;
+  if (room_left < sizeof (char *))
+    goto no_more_room;
+  room_left -= (sizeof (char *));
+  rpc->r_aliases[0] = NULL;
+
+  i = 0;
+  while (*line != '\0')
     {
-      if (NISENTRYLEN (i, 1, result) +1 > room_left)
+      /* Skip leading blanks.  */
+      while (isspace (*line))
+        line++;
+
+      if (*line == '\0')
+        break;
+
+      if (room_left < sizeof (char *))
+	goto no_more_room;
+
+      room_left -= sizeof (char *);
+      rpc->r_aliases[i] = line;
+
+      while (*line != '\0' && *line != ' ')
+        ++line;
+
+      if (line != rpc->r_aliases[i])
         {
-          __set_errno (ERANGE);
-          return 0;
+          if (*line != '\0')
+            {
+              *line = '\0';
+              ++line;
+            }
+          ++i;
         }
-      strcat (p, " ");
-      strncat (p, NISENTRYVAL (i, 1, result), NISENTRYLEN (i, 1, result));
-      room_left -= (NISENTRYLEN (i, 1, result) + 1);
+      else
+        rpc->r_aliases[i] = NULL;
     }
 
-  return _nss_files_parse_rpcent (p, rpc, 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, "rpc.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_setrpcent (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
@@ -133,11 +183,6 @@ _nss_nisplus_endrpcent (void)
   if (result)
     nis_freeresult (result);
   result = NULL;
-  if (names)
-    {
-      nis_freenames (names);
-      names = NULL;
-    }
 
   __libc_lock_unlock (lock);
 
@@ -155,11 +200,11 @@ internal_nisplus_getrpcent_r (struct rpcent *rpc, char *buffer,
     {
       if (result == NULL)
 	{
-	  names = nis_getnames ("rpc.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);
 	}
@@ -167,7 +212,7 @@ internal_nisplus_getrpcent_r (struct rpcent *rpc, 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)
@@ -201,32 +246,37 @@ _nss_nisplus_getrpcbyname_r (const char *name, struct rpcent *rpc,
 {
   int parse_res;
 
+  if (tablename_val == NULL)
+    if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+      return NSS_STATUS_UNAVAIL;
+
   if (name == NULL)
     return NSS_STATUS_NOTFOUND;
   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],rpc.org_dir", name);
-      result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+      sprintf (buf, "[name=%s],%s", name, 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,
 		  "rpc_tbl") != 0 ||
-          result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 3)
-        sprintf (buf, "[cname=%s],rpc.org_dir", name);
+          result->objects.objects_val->EN_data.en_cols.en_cols_len < 3)
+        sprintf (buf, "[cname=%s],%s", name, tablename_val);
       else
-        sprintf (buf, "[cname=%s],rpc.org_dir", NISENTRYVAL(0, 0, result));
+        sprintf (buf, "[cname=%s],%s", NISENTRYVAL(0, 0, result),
+		 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)
 	{
@@ -254,31 +304,37 @@ enum nss_status
 _nss_nisplus_getrpcbynumber_r (const int number, struct rpcent *rpc,
 				char *buffer, size_t buflen)
 {
-  int parse_res;
-  nis_result *result;
-  char buf[100];
+  if (tablename_val == NULL)
+    if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+      return NSS_STATUS_UNAVAIL;
 
-  snprintf (buf, sizeof (buf), "[number=%d],rpc.org_dir", number);
+  {
+    int parse_res;
+    nis_result *result;
+    char buf[100 + tablename_len];
 
-  result = nis_list(buf, EXPAND_NAME, NULL, NULL);
+    snprintf (buf, sizeof (buf), "[number=%d],%s", number, tablename_val);
 
-  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
-    {
-      enum nss_status status = niserr2nss (result->status);
+    result = nis_list(buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
 
-      nis_freeresult (result);
-      return status;
-    }
+    if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+      {
+	enum nss_status status = niserr2nss (result->status);
 
-  parse_res = _nss_nisplus_parse_rpcent (result, rpc, buffer, buflen);
+	nis_freeresult (result);
+	return status;
+      }
 
-  nis_freeresult (result);
+    parse_res = _nss_nisplus_parse_rpcent (result, rpc, buffer, buflen);
 
-  if (parse_res)
-    return NSS_STATUS_SUCCESS;
+    nis_freeresult (result);
 
-  if (!parse_res && errno == ERANGE)
-    return NSS_STATUS_TRYAGAIN;
-  else
-    return NSS_STATUS_NOTFOUND;
+    if (parse_res)
+      return NSS_STATUS_SUCCESS;
+
+    if (!parse_res && errno == ERANGE)
+      return NSS_STATUS_TRYAGAIN;
+    else
+      return NSS_STATUS_NOTFOUND;
+  }
 }