* nis/nis_call.c (__prepare_niscall): New function. Split outcvs/fedora-glibc-20060521T2153

	from __do_niscall.
	* nis/nis_table.c (__create_ib_request): Renamed from create_ib_request
	and exported.
	(__follow_path): New function.  Split out from nis_list.
	* nis/nis_xdr.h: Add libnsl_hidden_proto for _xdr_ib_request and
	_xdr_nis_result.
	* nis/nis_xdr.c: Add libnsl_hidden_def for _xdr_ib_request and
	_xdr_nis_result.
	* nis/libnsl.h: Declare __prepare_niscall, __create_ib_request,
	and __follow_path.
	* nis/Versions: Export __prepare_niscall, __create_ib_request,
	__follow_path, __do_niscall3, _xdr_ib_request, and _xdr_nis_result
	from libnsl for version GLIBC_PRIVATE.
	* nis/nisplus-parser.h: Remove _nss_nisplus_parse_pwent_chk.
	Remove entry parameter from _nss_nisplus_parse_pwent and
	_nss_nisplus_parse_grent.
	* nis/nss_nisplus/nisplus-parser.c: Likewise.
	* nis/nss_nisplus/nisplus-pwd.c: Remove support for SETENT_BATCH_READ
	again.  Rewrite getpwent handling to not use nis_first_entry and
	nis_next_entry.  Roll out own niscall handling.
	* nis/nss_nisplus/nisplus-grp.c: Likewise.

	* sunrpc/xdr_rec.c: Fix typo in comment.

2006-05-18  David Woodhouse  <dwmw2@redhat.com>

10 files changed, 450 insertions, 356 deletions

diff --git a/nis/Versions b/nis/Versions
index 8cea16396f..c7d87bd4ee 100644
--- a/nis/Versions
+++ b/nis/Versions
@@ -58,7 +58,8 @@ libnsl {
     xdr_ypall;
   }
   GLIBC_PRIVATE {
-    _nsl_default_nss;
+    _nsl_default_nss; __prepare_niscall; __follow_path; __do_niscall3;
+    __create_ib_request; _xdr_ib_request; _xdr_nis_result;
   }
 }
 
diff --git a/nis/libnsl.h b/nis/libnsl.h
index 9f78469fe2..eace582f85 100644
--- a/nis/libnsl.h
+++ b/nis/libnsl.h
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <rpcsvc/nis.h>
+
 #define NSS_FLAG_NETID_AUTHORITATIVE	1
 #define NSS_FLAG_SERVICES_AUTHORITATIVE	2
 #define NSS_FLAG_SETENT_BATCH_READ	4
@@ -23,3 +25,15 @@
 
 /* Get current set of default flags.  */
 extern int _nsl_default_nss (void);
+
+/* Set up everything for a call to __do_niscall3.  */
+extern nis_error __prepare_niscall (const_nis_name name, directory_obj **dirp,
+				    dir_binding *bptrp, unsigned int flags);
+
+extern struct ib_request *__create_ib_request (const_nis_name name,
+					       unsigned int flags);
+libnsl_hidden_proto (__create_ib_request)
+
+extern nis_error __follow_path (char **tablepath, char **tableptr,
+				struct ib_request *ibreq, dir_binding *bptr);
+libnsl_hidden_proto (__follow_path)
diff --git a/nis/nis_call.c b/nis/nis_call.c
index 499d042e3c..bd6bcc50ab 100644
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -531,50 +531,68 @@ __nisfind_server (const_nis_name name, directory_obj **dir)
   return result;
 }
 
+
 nis_error
-__do_niscall (const_nis_name name, u_long prog, xdrproc_t xargs,
-	      caddr_t req, xdrproc_t xres, caddr_t resp, unsigned int flags,
-	      nis_cb *cb)
+__prepare_niscall (const_nis_name name, directory_obj **dirp,
+		   dir_binding *bptrp, unsigned int flags)
 {
-  nis_error retcode;
-  dir_binding bptr;
-  directory_obj *dir = NULL;
+  nis_error retcode = __nisfind_server (name, dirp);
+  if (__builtin_expect (retcode != NIS_SUCCESS, 0))
+    return retcode;
+
   nis_server *server;
   u_int server_len;
-  int saved_errno = errno;
-
-  retcode = __nisfind_server (name, &dir);
-  if (retcode != NIS_SUCCESS)
-    return retcode;
 
   if (flags & MASTER_ONLY)
     {
-      server = dir->do_servers.do_servers_val;
+      server = (*dirp)->do_servers.do_servers_val;
       server_len = 1;
     }
   else
     {
-      server = dir->do_servers.do_servers_val;
-      server_len = dir->do_servers.do_servers_len;
+      server = (*dirp)->do_servers.do_servers_val;
+      server_len = (*dirp)->do_servers.do_servers_len;
     }
 
-  retcode = __nisbind_create (&bptr, server, server_len, flags);
+  retcode = __nisbind_create (bptrp, server, server_len, flags);
+  if (retcode == NIS_SUCCESS)
+    {
+      do
+	if (__nisbind_connect (bptrp) == NIS_SUCCESS)
+	  return NIS_SUCCESS;
+      while (__nisbind_next (bptrp) == NIS_SUCCESS);
+
+      __nisbind_destroy (bptrp);
+      memset (bptrp, '\0', sizeof (*bptrp));
+
+      retcode = NIS_NAMEUNREACHABLE;
+    }
+
+  nis_free_directory (*dirp);
+  *dirp = NULL;
+
+  return retcode;
+}
+
+
+nis_error
+__do_niscall (const_nis_name name, u_long prog, xdrproc_t xargs,
+	      caddr_t req, xdrproc_t xres, caddr_t resp, unsigned int flags,
+	      nis_cb *cb)
+{
+  dir_binding bptr;
+  directory_obj *dir = NULL;
+  int saved_errno = errno;
+
+  nis_error retcode = __prepare_niscall (name, &dir, &bptr, flags);
   if (retcode == NIS_SUCCESS)
     {
-      while (__nisbind_connect (&bptr) != NIS_SUCCESS)
-	{
-	  if (__nisbind_next (&bptr) != NIS_SUCCESS)
-	    {
-	      nis_free_directory (dir);
-	      return NIS_NAMEUNREACHABLE;
-	    }
-	}
       retcode = __do_niscall3 (&bptr, prog, xargs, req, xres, resp, flags, cb);
 
       __nisbind_destroy (&bptr);
-    }
 
-  nis_free_directory (dir);
+      nis_free_directory (dir);
+    }
 
   __set_errno (saved_errno);
 
diff --git a/nis/nis_table.c b/nis/nis_table.c
index eddba67dda..3213035067 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -17,15 +17,17 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <assert.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
+#include "libnsl.h"
 
 
-static struct ib_request *
-create_ib_request (const_nis_name name, unsigned int flags)
+struct ib_request *
+__create_ib_request (const_nis_name name, unsigned int flags)
 {
   struct ib_request *ibreq = calloc (1, sizeof (struct ib_request));
   nis_attr *search_val = NULL;
@@ -125,6 +127,7 @@ create_ib_request (const_nis_name name, unsigned int flags)
 
   return ibreq;
 }
+libnsl_hidden_def (__create_ib_request)
 
 static const struct timeval RPCTIMEOUT = {10, 0};
 
@@ -160,6 +163,38 @@ get_tablepath (char *name, dir_binding *bptr)
   return str;
 }
 
+
+nis_error
+__follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
+	       dir_binding *bptr)
+{
+  if (*tablepath == NULL)
+    {
+      *tablepath = get_tablepath (ibreq->ibr_name, bptr);
+      if (*tablepath == NULL)
+	return NIS_NOMEMORY;
+
+      *tableptr = *tablepath;
+    }
+  if (*tableptr == NULL)
+    return NIS_NOTFOUND;
+
+  char *newname = strsep (tableptr, ":");
+  if (newname[0] == '\0')
+    return NIS_NOTFOUND;
+
+  newname = strdup (newname);
+  if (newname == NULL)
+    return NIS_NOMEMORY;
+
+  free (ibreq->ibr_name);
+  ibreq->ibr_name = newname;
+
+  return NIS_SUCCESS;
+}
+libnsl_hidden_def (__follow_path)
+
+
 nis_result *
 nis_list (const_nis_name name, unsigned int flags,
 	  int (*callback) (const_nis_name name,
@@ -193,7 +228,7 @@ nis_list (const_nis_name name, unsigned int flags,
       return res;
     }
 
-  ibreq = create_ib_request (name, flags);
+  ibreq = __create_ib_request (name, flags);
   if (ibreq == NULL)
     {
       status = NIS_BADNAME;
@@ -260,6 +295,7 @@ nis_list (const_nis_name name, unsigned int flags,
 
       if (callback != NULL)
 	{
+	  assert (cb == NULL);
 	  cb = __nis_create_callback (callback, userdata, flags);
 	  ibreq->ibr_cbhost.ibr_cbhost_len = 1;
 	  ibreq->ibr_cbhost.ibr_cbhost_val = cb->serv;
@@ -327,69 +363,30 @@ nis_list (const_nis_name name, unsigned int flags,
 		   following code.  But it also would unnecessarily
 		   free the result structure.  We avoid this here
 		   along with the necessary tests.  */
-#if 1
 		xdr_free ((xdrproc_t) _xdr_nis_result, (char *)res);
 		memset (res, '\0', sizeof (*res));
-#else
-		nis_freeresult (res);
-		res = calloc (1, sizeof (nis_result));
-		if (res == NULL)
-		  goto fail;
-#endif
 		first_try = 1; /* Try at first the old binding */
 		goto again;
 	      }
 	    else if ((flags & FOLLOW_PATH)
 		     && NIS_RES_STATUS (res) == NIS_PARTIAL)
 	      {
-		if (tablepath == NULL)
-		  {
-		    tablepath = get_tablepath (ibreq->ibr_name, &bptr);
-		    tableptr = tablepath;
-		  }
-		if (tableptr == NULL)
+		clnt_status = __follow_path (&tablepath, &tableptr, ibreq,
+					     &bptr);
+		if (clnt_status != NIS_SUCCESS)
 		  {
-		    ++done;
-		    break;
-		  }
-		free (ibreq->ibr_name);
-		ibreq->ibr_name = strsep (&tableptr, ":");
-		if (ibreq->ibr_name == NULL || ibreq->ibr_name[0] == '\0')
-		  {
-		    ibreq->ibr_name = strdup ("");
-		    if (ibreq->ibr_name == NULL)
-		      {
-			NIS_RES_STATUS (res) = NIS_NOMEMORY;
-			goto fail;
-		      }
+		    NIS_RES_STATUS (res) = clnt_status;
 		    ++done;
 		  }
 		else
 		  {
-		    ibreq->ibr_name = strdup (ibreq->ibr_name);
 		    /* The following is a non-obvious optimization.  A
 		       nis_freeresult call would call xdr_free as the
 		       following code.  But it also would unnecessarily
 		       free the result structure.  We avoid this here
 		       along with the necessary tests.  */
-#if 1
-		    xdr_free ((xdrproc_t) _xdr_nis_result, (char *)res);
+		    xdr_free ((xdrproc_t) _xdr_nis_result, (char *) res);
 		    memset (res, '\0', sizeof (*res));
-		    if (ibreq->ibr_name == NULL)
-		      {
-			NIS_RES_STATUS (res) = NIS_NOMEMORY;
-			goto fail;
-		      }
-#else
-		    nis_freeresult (res);
-		    res = calloc (1, sizeof (nis_result));
-		    if (res == NULL || ibreq->ibr_name == NULL)
-		      {
-			free (res);
-			res = NULL;
-			goto fail;
-		      }
-#endif
 		    first_try = 1;
 		    goto again;
 		  }
@@ -407,30 +404,10 @@ nis_list (const_nis_name name, unsigned int flags,
 		  ++done;
 		else
 		  {
-		    if (tablepath == NULL)
-		      {
-			tablepath = get_tablepath (ibreq->ibr_name, &bptr);
-			tableptr = tablepath;
-		      }
-		    if (tableptr == NULL)
-		      {
-			++done;
-			break;
-		      }
-		    free (ibreq->ibr_name);
-		    ibreq->ibr_name = strsep (&tableptr, ":");
-		    if (ibreq->ibr_name == NULL || ibreq->ibr_name[0] == '\0')
-		      {
-			ibreq->ibr_name = strdup ("");
-			++done;
-		      }
-		    else
-		      ibreq->ibr_name = strdup (ibreq->ibr_name);
-		    if (ibreq->ibr_name == NULL)
-		      {
-			NIS_RES_STATUS (res) = NIS_NOMEMORY;
-			goto fail;
-		      }
+		    NIS_RES_STATUS (res)
+		      = __follow_path (&tablepath, &tableptr, ibreq, &bptr);
+		    if (NIS_RES_STATUS (res) != NIS_SUCCESS)
+		      ++done;
 		  }
 	      }
 	    break;
@@ -524,7 +501,7 @@ nis_add_entry (const_nis_name name, const nis_object *obj2, unsigned int flags)
       return res;
     }
 
-  ib_request *ibreq = create_ib_request (name, flags);
+  ib_request *ibreq = __create_ib_request (name, flags);
   if (ibreq == NULL)
     {
       NIS_RES_STATUS (res) = NIS_BADNAME;
@@ -587,7 +564,7 @@ nis_modify_entry (const_nis_name name, const nis_object *obj2,
   if (res == NULL)
     return NULL;
 
-  ibreq = create_ib_request (name, flags);
+  ibreq = __create_ib_request (name, flags);
   if (ibreq == NULL)
     {
       NIS_RES_STATUS (res) = NIS_BADNAME;
@@ -646,7 +623,7 @@ nis_remove_entry (const_nis_name name, const nis_object *obj,
       return res;
     }
 
-  ibreq = create_ib_request (name, flags);
+  ibreq = __create_ib_request (name, flags);
   if (ibreq == NULL)
     {
       NIS_RES_STATUS (res) = NIS_BADNAME;
@@ -693,7 +670,7 @@ nis_first_entry (const_nis_name name)
       return res;
     }
 
-  ibreq = create_ib_request (name, 0);
+  ibreq = __create_ib_request (name, 0);
   if (ibreq == NULL)
     {
       NIS_RES_STATUS (res) = NIS_BADNAME;
@@ -730,7 +707,7 @@ nis_next_entry (const_nis_name name, const netobj *cookie)
       return res;
     }
 
-  ibreq = create_ib_request (name, 0);
+  ibreq = __create_ib_request (name, 0);
   if (ibreq == NULL)
     {
       NIS_RES_STATUS (res) = NIS_BADNAME;
diff --git a/nis/nis_xdr.c b/nis/nis_xdr.c
index 3d4f7268c0..bcb396a509 100644
--- a/nis/nis_xdr.c
+++ b/nis/nis_xdr.c
@@ -308,6 +308,7 @@ _xdr_nis_result (XDR *xdrs, nis_result *objp)
     }
   return res;
 }
+libnsl_hidden_def (_xdr_nis_result)
 
 bool_t
 _xdr_ns_request (XDR *xdrs, ns_request *objp)
@@ -357,6 +358,7 @@ _xdr_ib_request (XDR *xdrs, ib_request *objp)
     }
   return res;
 }
+libnsl_hidden_def (_xdr_ib_request)
 
 bool_t
 _xdr_ping_args (XDR *xdrs, ping_args *objp)
diff --git a/nis/nis_xdr.h b/nis/nis_xdr.h
index 791a964d2f..a59362c78f 100644
--- a/nis/nis_xdr.h
+++ b/nis/nis_xdr.h
@@ -28,9 +28,7 @@ extern  bool_t _xdr_nis_server (XDR *, nis_server*) attribute_hidden;
 extern  bool_t _xdr_directory_obj (XDR *, directory_obj*) attribute_hidden;
 extern  bool_t _xdr_nis_object (XDR *, nis_object*) attribute_hidden;
 extern  bool_t _xdr_nis_error (XDR *, nis_error*) attribute_hidden;
-extern  bool_t _xdr_nis_result (XDR *, nis_result*) attribute_hidden;
 extern  bool_t _xdr_ns_request (XDR *, ns_request*) attribute_hidden;
-extern  bool_t _xdr_ib_request (XDR *, ib_request*) attribute_hidden;
 extern  bool_t _xdr_ping_args (XDR *, ping_args*) attribute_hidden;
 extern  bool_t _xdr_cp_result (XDR *, cp_result*) attribute_hidden;
 extern  bool_t _xdr_nis_tag (XDR *, nis_tag*) attribute_hidden;
@@ -38,4 +36,9 @@ extern  bool_t _xdr_nis_taglist (XDR *, nis_taglist*) attribute_hidden;
 extern  bool_t _xdr_fd_args (XDR *, fd_args*) attribute_hidden;
 extern  bool_t _xdr_fd_result (XDR *, fd_result*) attribute_hidden;
 
+extern  bool_t _xdr_ib_request (XDR *, ib_request*);
+libnsl_hidden_proto (_xdr_ib_request)
+extern  bool_t _xdr_nis_result (XDR *, nis_result*);
+libnsl_hidden_proto (_xdr_nis_result)
+
 #endif
diff --git a/nis/nisplus-parser.h b/nis/nisplus-parser.h
index 97580d224a..4dc8db8c9f 100644
--- a/nis/nisplus-parser.h
+++ b/nis/nisplus-parser.h
@@ -24,15 +24,12 @@
 #include <grp.h>
 #include <shadow.h>
 
-extern int _nss_nisplus_parse_pwent (nis_result *result, size_t entry,
-				     struct passwd *pw, char *buffer,
-				     size_t buflen, int *errnop);
-extern int _nss_nisplus_parse_pwent_chk (nis_result *result, struct passwd *pw,
-					 char *buffer, size_t buflen,
-					 int *errnop);
-extern int _nss_nisplus_parse_grent (nis_result *result, u_long entry,
-				     struct group *gr, char *buffer,
-				     size_t buflen, int *errnop);
+extern int _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw,
+				     char *buffer, size_t buflen, int *errnop);
+
+extern int _nss_nisplus_parse_grent (nis_result *result, struct group *gr,
+				     char *buffer, size_t buflen, int *errnop);
+
 extern int _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp,
 				     char *buffer, size_t buflen, int *errnop);
 
diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c
index 624b20610a..c1adc98aee 100644
--- a/nis/nss_nisplus/nisplus-grp.c
+++ b/nis/nss_nisplus/nisplus-grp.c
@@ -29,12 +29,23 @@
 
 #include "nss-nisplus.h"
 #include "nisplus-parser.h"
+#include <libnsl.h>
+#include <nis_intern.h>
+#include <nis_xdr.h>
 
 
 __libc_lock_define_initialized (static, lock);
 
-static nis_result *result;
-static unsigned long next_entry;
+/* Connection information.  */
+static ib_request *ibreq;
+static directory_obj *dir;
+static dir_binding bptr;
+static char *tablepath;
+static char *tableptr;
+/* Cursor.  */
+static netobj cursor;
+
+
 static nis_name tablename_val;
 static size_t tablename_len;
 
@@ -66,43 +77,57 @@ _nss_create_tablename (int *errnop)
   return NSS_STATUS_SUCCESS;
 }
 
-static enum nss_status
-internal_setgrent (void)
+
+static void
+internal_endgrent (void)
 {
-  enum nss_status status;
+  __nisbind_destroy (&bptr);
+  memset (&bptr, '\0', sizeof (bptr));
 
-  if (result != NULL)
-    {
-      nis_freeresult (result);
-      result = NULL;
-    }
-  next_entry = 0;
+  nis_free_directory (dir);
+  dir = NULL;
+
+  nis_free_request (ibreq);
+  ibreq = NULL;
+
+  xdr_free ((xdrproc_t) xdr_netobj, (char *) &cursor);
+  memset (&cursor, '\0', sizeof (cursor));
+
+  free (tablepath);
+  tableptr = tablepath = NULL;
+}
+
+
+static enum nss_status
+internal_setgrent (int *errnop)
+{
+  enum nss_status status = NSS_STATUS_SUCCESS;
 
   if (tablename_val == NULL)
-    {
-      int err;
-      if (_nss_create_tablename (&err) != NSS_STATUS_SUCCESS)
-	return NSS_STATUS_UNAVAIL;
-    }
+    status = _nss_create_tablename (errnop);
 
-  result = nis_list (tablename_val, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
-  if (result == NULL)
+  if (status == NSS_STATUS_SUCCESS)
     {
-      status = NSS_STATUS_TRYAGAIN;
-      __set_errno (ENOMEM);
-    }
-  else
-    {
-      status = niserr2nss (result->status);
-      if (status != NSS_STATUS_SUCCESS)
+      ibreq = __create_ib_request (tablename_val, 0);
+      if (ibreq == NULL)
 	{
-	  nis_freeresult (result);
-	  result = NULL;
+	  *errnop = errno;
+	  return NSS_STATUS_TRYAGAIN;
+	}
+
+      nis_error retcode = __prepare_niscall (tablename_val, &dir, &bptr, 0);
+      if (retcode != NIS_SUCCESS)
+	{
+	  nis_free_request (ibreq);
+	  ibreq = NULL;
+	  status = niserr2nss (retcode);
 	}
     }
+
   return status;
 }
 
+
 enum nss_status
 _nss_nisplus_setgrent (int stayopen)
 {
@@ -110,60 +135,133 @@ _nss_nisplus_setgrent (int stayopen)
 
   __libc_lock_lock (lock);
 
-  status = internal_setgrent ();
+  internal_endgrent ();
+
+  // XXX We need to be able to set errno.  Pass in new parameter.
+  int err;
+  status = internal_setgrent (&err);
 
   __libc_lock_unlock (lock);
 
   return status;
 }
 
+
 enum nss_status
 _nss_nisplus_endgrent (void)
 {
   __libc_lock_lock (lock);
 
-  if (result != NULL)
-    {
-      nis_freeresult (result);
-      result = NULL;
-    }
+  internal_endgrent ();
 
   __libc_lock_unlock (lock);
 
   return NSS_STATUS_SUCCESS;
 }
 
+
 static enum nss_status
 internal_nisplus_getgrent_r (struct group *gr, char *buffer, size_t buflen,
 			     int *errnop)
 {
-  int parse_res;
-
-  if (result == NULL)
-    {
-      enum nss_status status;
-
-      status = internal_setgrent ();
-      if (result == NULL || status != NSS_STATUS_SUCCESS)
-	return status;
-    }
+  int parse_res = -1;
+  enum nss_status retval = NSS_STATUS_SUCCESS;
 
   /* Get the next entry until we found a correct one. */
   do
     {
-      if (next_entry >= result->objects.objects_len)
-	return NSS_STATUS_NOTFOUND;
+      nis_error status;
+      nis_result result;
+      memset (&result, '\0', sizeof (result));
 
-      parse_res = _nss_nisplus_parse_grent (result, next_entry, gr,
+      if (cursor.n_bytes == NULL)
+	{
+	  if (ibreq == NULL)
+	    {
+	      retval = internal_setgrent (errnop);
+	      if (retval != NSS_STATUS_SUCCESS)
+		return retval;
+	    }
+
+	  status = __do_niscall3 (&bptr, NIS_IBFIRST,
+				  (xdrproc_t) _xdr_ib_request,
+				  (caddr_t) ibreq,
+				  (xdrproc_t) _xdr_nis_result,
+				  (caddr_t) &result,
+				  0, NULL);
+	}
+      else
+	{
+	  ibreq->ibr_cookie.n_bytes = cursor.n_bytes;
+	  ibreq->ibr_cookie.n_len = cursor.n_len;
+
+	  status = __do_niscall3 (&bptr, NIS_IBNEXT,
+				  (xdrproc_t) _xdr_ib_request,
+				  (caddr_t) ibreq,
+				  (xdrproc_t) _xdr_nis_result,
+				  (caddr_t) &result,
+				  0, NULL);
+
+	  ibreq->ibr_cookie.n_bytes = NULL;
+	  ibreq->ibr_cookie.n_len = 0;
+	}
+
+      if (status != NIS_SUCCESS)
+	return niserr2nss (status);
+
+      if (NIS_RES_STATUS (&result) == NIS_NOTFOUND)
+	{
+	  /* No more entries on this server.  This means we have to go
+	     to the next server on the path.  */
+	  status = __follow_path (&tablepath, &tableptr, ibreq, &bptr);
+	  if (status != NIS_SUCCESS)