Update.

2003-06-17  Thorsten Kukuk  <kukuk@suse.de>

	* nis/Makefile: Remove NIS/NIS+ files from nss_compat module.
	* nis/nss_compat/compat-grp.c: Don't use our own NIS/NIS+ functions,
	dlopen corresponding NSS module instead.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c: Likewise.
	* nis/nss_compat/compat-initgroups.c: Disabled for now.
	* nss/Versions: Export __nss_lookup_function.

2003-06-19  Daniel Jacobowitz  <drow@mvista.com>

	* sysdeps/unix/sysv/linux/kernel-features.h: Update kernel features
	for the SH architecture.

2003-06-25  Thorsten Kukuk  <kukuk@suse.de>

	* csu/Makefile: Use CPPFLAGS to find correct linux/version.h.

12 files changed, 602 insertions, 1773 deletions

diff --git a/ChangeLog b/ChangeLog
index 334e28250c..2ba388ec9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2003-06-17  Thorsten Kukuk  <kukuk@suse.de>
+
+	* nis/Makefile: Remove NIS/NIS+ files from nss_compat module.
+	* nis/nss_compat/compat-grp.c: Don't use our own NIS/NIS+ functions,
+	dlopen corresponding NSS module instead.
+	* nis/nss_compat/compat-pwd.c: Likewise.
+	* nis/nss_compat/compat-spwd.c: Likewise.
+	* nis/nss_compat/compat-initgroups.c: Disabled for now.
+	* nss/Versions: Export __nss_lookup_function.
+
+2003-06-19  Daniel Jacobowitz  <drow@mvista.com>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h: Update kernel features
+	for the SH architecture.
+
+2003-06-25  Thorsten Kukuk  <kukuk@suse.de>
+
+	* csu/Makefile: Use CPPFLAGS to find correct linux/version.h.
+
 2003-06-25  Andreas Jaeger  <aj@suse.de>
 
 	* stdlib/tst-strtod.c (main): Declare constant long double as
@@ -5,7 +24,7 @@
 
 	* posix/tst-nanosleep.c: Include <time.h> for nanosleep
 	declaration.
-	
+
 	* stdio-common/tst-fphex.c: Fix format string.
 
 	* posix/transbug.c: Include <string.h> for memset and strlen
diff --git a/csu/Makefile b/csu/Makefile
index 95da703ecf..1a3c9c112c 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -217,7 +217,7 @@ $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files)
 	$(make-target-directory)
 	(case $(config-os) in \
 	   linux*) version=`(echo -e "#include <linux/version.h>\nUTS_RELEASE"\
-			     | $(CC) -E -P - | \
+			     | $(CC) $(CPPFLAGS) -E -P - | \
 			     sed -e 's/"\([^"]*\)".*/\1/p' -e d) 2>/dev/null`;\
 		   if [ -z "$$version" ]; then \
 		     if [ -r /proc/version ]; then \
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 6cdbd1c388..984752d50a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-25  Petter Reinholdtsen  <pere@hungry.com>
+
+	* locales/an_ES: Change default charset from ISO-8859-1 to
+	ISO-8859-15 as the locale need the EURO sign.
+
+	* SUPPORTED (SUPPORTED-LOCALES): Add an_ES.ISO-8859-15.
+
 2003-06-21  Petter Reinholdtsen  <pere@hungry.com>
 
 	* locales/no_NO [LC_COLLATE]: Add missing eth letter, sorted as
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 0f81f8c1fb..ce36e57cc6 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -3,6 +3,7 @@
 # appropriate message.
 SUPPORTED-LOCALES=\
 af_ZA/ISO-8859-1 \
+an_ES/ISO-8859-15 \
 ar_AE/ISO-8859-6 \
 ar_BH/ISO-8859-6 \
 ar_DZ/ISO-8859-6 \
diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
index 30eafaf741..410df2d8b1 100644
--- a/localedata/locales/an_ES
+++ b/localedata/locales/an_ES
@@ -12,7 +12,7 @@ escape_char  /
 % Date: 2003-05-22
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
+% Charset: ISO-8859-15
 %
 % This file is under the
 % GNU General Public License.
diff --git a/nis/Makefile b/nis/Makefile
index 89f229d8f8..df85ab2774 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -54,8 +54,7 @@ libnsl-routines = yp_xdr ypclnt ypupdate_xdr \
 		  nis_findserv nis_callback nis_clone_dir nis_clone_obj\
 		  nis_clone_res
 
-libnss_compat-routines	:= $(addprefix compat-,grp pwd spwd initgroups) \
-			   nisplus-parser nss-nis nss-nisplus
+libnss_compat-routines	:= $(addprefix compat-,grp pwd spwd initgroups)
 libnss_compat-inhibit-o	= $(filter-out .os,$(object-suffixes))
 
 libnss_nis-routines	:= $(addprefix nis-,$(databases)) nis-initgroups \
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index c9750ae1be..fb6328cfca 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2001,2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
 
@@ -24,18 +24,20 @@
 #include <ctype.h>
 #include <bits/libc-lock.h>
 #include <string.h>
-#include <rpcsvc/yp.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/nis.h>
+#include <rpc/types.h>
 #include <nsswitch.h>
 
-#include "nss-nisplus.h"
-#include "nisplus-parser.h"
-
 static service_user *ni;
-static bool_t use_nisplus; /* default: group_compat: nis */
-static nis_name grptable; /* Name of the group table */
-static size_t grptablelen;
+static enum nss_status (*nss_setgrent) (int stayopen);
+static enum nss_status (*nss_getgrnam_r) (const char *name,
+					  struct group * grp, char *buffer,
+					  size_t buflen, int *errnop);
+static enum nss_status (*nss_getgrgid_r) (gid_t gid, struct group * grp,
+					  char *buffer, size_t buflen,
+					  int *errnop);
+static enum nss_status (*nss_getgrent_r) (struct group * grp, char *buffer,
+					  size_t buflen, int *errnop);
+static enum nss_status (*nss_endgrent) (void);
 
 /* Get the declaration of the parser function.  */
 #define ENTNAME grent
@@ -47,25 +49,22 @@ static size_t grptablelen;
 #define BLACKLIST_INITIAL_SIZE 512
 #define BLACKLIST_INCREMENT 256
 struct blacklist_t
-  {
-    char *data;
-    int current;
-    int size;
-  };
+{
+  char *data;
+  int current;
+  int size;
+};
 
 struct ent_t
-  {
-    bool_t nis;
-    bool_t nis_first;
-    char *oldkey;
-    int oldkeylen;
-    nis_result *result;
-    FILE *stream;
-    struct blacklist_t blacklist;
+{
+  bool_t nis_first;
+  bool_t files;
+  FILE *stream;
+  struct blacklist_t blacklist;
 };
 typedef struct ent_t ent_t;
 
-static ent_t ext_ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
+static ent_t ext_ent = {0, TRUE, NULL, {NULL, 0, 0}};
 
 /* Protect global state against multiple changers.  */
 __libc_lock_define_initialized (static, lock)
@@ -74,56 +73,27 @@ __libc_lock_define_initialized (static, lock)
 static void blacklist_store_name (const char *, ent_t *);
 static int in_blacklist (const char *, int, ent_t *);
 
-static enum nss_status
-_nss_first_init (void)
+/* Initialize the NSS interface/functions. The calling function must
+   hold the lock.  */
+static void
+init_nss_interface (void)
 {
-  if (ni == NULL)
-    {
-      __nss_database_lookup ("group_compat", NULL, "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
-
-  if (grptable == NULL)
+  if (__nss_database_lookup ("group_compat", NULL, "nis", &ni) >= 0)
     {
-      static const char key[] = "group.org_dir.";
-      const char *local_dir = nis_local_directory ();
-      size_t len_local_dir = strlen (local_dir);
-
-      grptable = malloc (sizeof (key) + len_local_dir);
-      if (grptable == NULL)
-        return NSS_STATUS_TRYAGAIN;
-
-      grptablelen = ((char *) mempcpy (mempcpy (grptable,
-						key, sizeof (key) - 1),
-				       local_dir, len_local_dir + 1)
-		     - grptable) - 1;
+      nss_setgrent = __nss_lookup_function (ni, "setgrent");
+      nss_getgrnam_r = __nss_lookup_function (ni, "getgrnam_r");
+      nss_getgrgid_r = __nss_lookup_function (ni, "getgrgid_r");
+      nss_getgrent_r = __nss_lookup_function (ni, "getgrent_r");
+      nss_endgrent = __nss_lookup_function (ni, "endgrent");
     }
-
-  return NSS_STATUS_SUCCESS;
 }
 
 static enum nss_status
-internal_setgrent (ent_t *ent)
+internal_setgrent (ent_t *ent, int stayopen)
 {
   enum nss_status status = NSS_STATUS_SUCCESS;
 
-  ent->nis = ent->nis_first = 0;
-
-  if (_nss_first_init () != NSS_STATUS_SUCCESS)
-    return NSS_STATUS_UNAVAIL;
-
-  if (ent->oldkey != NULL)
-    {
-      free (ent->oldkey);
-      ent->oldkey = NULL;
-      ent->oldkeylen = 0;
-    }
-
-  if (ent->result != NULL)
-    {
-      nis_freeresult (ent->result);
-      ent->result = NULL;
-    }
+  ent->files = TRUE;
 
   if (ent->blacklist.data != NULL)
     {
@@ -154,7 +124,7 @@ internal_setgrent (ent_t *ent)
 	  if (result < 0)
 	    {
 	      /* Something went wrong.  Close the stream and return a
-		 failure.  */
+	         failure.  */
 	      fclose (ent->stream);
 	      ent->stream = NULL;
 	      status = NSS_STATUS_UNAVAIL;
@@ -164,6 +134,9 @@ internal_setgrent (ent_t *ent)
   else
     rewind (ent->stream);
 
+  if (status == NSS_STATUS_SUCCESS && nss_setgrent)
+    return nss_setgrent (stayopen);
+
   return status;
 }
 
@@ -175,7 +148,10 @@ _nss_compat_setgrent (int stayopen)
 
   __libc_lock_lock (lock);
 
-  result = internal_setgrent (&ext_ent);
+  if (ni == NULL)
+    init_nss_interface ();
+
+  result = internal_setgrent (&ext_ent, stayopen);
 
   __libc_lock_unlock (lock);
 
@@ -186,27 +162,15 @@ _nss_compat_setgrent (int stayopen)
 static enum nss_status
 internal_endgrent (ent_t *ent)
 {
+  if (nss_endgrent)
+    nss_endgrent ();
+
   if (ent->stream != NULL)
     {
       fclose (ent->stream);
       ent->stream = NULL;
     }
 
-  ent->nis = ent->nis_first = 0;
-
-  if (ent->oldkey != NULL)
-    {
-      free (ent->oldkey);
-      ent->oldkey = NULL;
-      ent->oldkeylen = 0;
-    }
-
-  if (ent->result != NULL)
-    {
-      nis_freeresult (ent->result);
-      ent->result = NULL;
-    }
-
   if (ent->blacklist.data != NULL)
     {
       ent->blacklist.current = 1;
@@ -233,239 +197,44 @@ _nss_compat_endgrent (void)
   return result;
 }
 
+/* get the next group from NSS  (+ entry) */
 static enum nss_status
-getgrent_next_nis (struct group *result, ent_t *ent, char *buffer,
+getgrent_next_nss (struct group *result, ent_t *ent, char *buffer,
 		   size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
-  char *domain;
-  char *outkey, *outval;
-  int outkeylen, outvallen, parse_res;
-  char *p;
-
-  if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-    {
-      ent->nis = 0;
-      return NSS_STATUS_NOTFOUND;
-    }
-
-  do
-    {
-      char *save_oldkey;
-      int save_oldlen;
-      bool_t save_nis_first;
-
-      if (ent->nis_first)
-	{
-	  if (yp_first (domain, "group.byname", &outkey, &outkeylen,
-			&outval, &outvallen) != YPERR_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      return NSS_STATUS_UNAVAIL;
-	    }
-
-	  if ( buflen < ((size_t) outvallen + 1))
-	    {
-	      free (outval);
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  save_oldkey = ent->oldkey;
-	  save_oldlen = ent->oldkeylen;
-	  save_nis_first = TRUE;
-	  ent->oldkey = outkey;
-	  ent->oldkeylen = outkeylen;
-	  ent->nis_first = FALSE;
-	}
-      else
-	{
-	  if (yp_next (domain, "group.byname", ent->oldkey, ent->oldkeylen,
-		       &outkey, &outkeylen, &outval, &outvallen)
-	      != YPERR_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      return NSS_STATUS_NOTFOUND;
-	    }
-
-	  if ( buflen < ((size_t) outvallen + 1))
-	    {
-	      free (outval);
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  save_oldkey = ent->oldkey;
-	  save_oldlen = ent->oldkeylen;
-	  save_nis_first = FALSE;
-	  ent->oldkey = outkey;
-	  ent->oldkeylen = outkeylen;
-	}
-
-      /* Copy the found data to our buffer...  */
-      p = strncpy (buffer, outval, buflen);
-
-      /* ...and free the data.  */
-      free (outval);
-
-      while (isspace (*p))
-	++p;
-
-      parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	{
-	  free (ent->oldkey);
-	  ent->oldkey = save_oldkey;
-	  ent->oldkeylen = save_oldlen;
-	  ent->nis_first = save_nis_first;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  if (!save_nis_first)
-	    free (save_oldkey);
-	}
-
-      if (parse_res &&
-	  in_blacklist (result->gr_name, strlen (result->gr_name), ent))
-	parse_res = 0; /* if result->gr_name in blacklist,search next entry */
-    }
-  while (!parse_res);
-
-  return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
-                       size_t buflen, int *errnop)
-{
-  int parse_res;
+  if (!nss_getgrent_r)
+    return NSS_STATUS_UNAVAIL;
 
   do
     {
-      nis_result *save_oldres;
-      bool_t save_nis_first;
-
-      if (ent->nis_first)
-        {
-	  save_oldres = ent->result;
-	  save_nis_first = TRUE;
-          ent->result = nis_first_entry(grptable);
-          if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
-            {
-              ent->nis = 0;
-              return niserr2nss (ent->result->status);
-            }
-          ent->nis_first = FALSE;
-        }
-      else
-        {
-          nis_result *res;
-
-	  save_oldres = ent->result;
-	  save_nis_first = FALSE;
-          res = nis_next_entry(grptable, &ent->result->cookie);
-          ent->result = res;
-          if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
-            {
-	      ent->nis = 0;
-	      return niserr2nss (ent->result->status);
-            }
-        }
-      parse_res = _nss_nisplus_parse_grent (ent->result, 0, result,
-					    buffer, buflen, errnop);
-      if (parse_res == -1)
-	{
-	  nis_freeresult (ent->result);
-	  ent->result = save_oldres;
-	  ent->nis_first = save_nis_first;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  if (!save_nis_first)
-	    nis_freeresult (save_oldres);
-	}
+      enum nss_status status;
 
-      if (parse_res &&
-          in_blacklist (result->gr_name, strlen (result->gr_name), ent))
-        parse_res = 0; /* if result->gr_name in blacklist,search next entry */
+      if ((status = nss_getgrent_r (result, buffer, buflen, errnop)) !=
+	  NSS_STATUS_SUCCESS)
+	return status;
     }
-  while (!parse_res);
+  while (in_blacklist (result->gr_name, strlen (result->gr_name), ent));
 
   return NSS_STATUS_SUCCESS;
 }
 
 /* This function handle the +group entrys in /etc/group */
 static enum nss_status
-getgrnam_plusgroup (const char *name, struct group *result, char *buffer,
-		    size_t buflen, int *errnop)
+getgrnam_plusgroup (const char *name, struct group *result, ent_t *ent,
+		    char *buffer, size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
-  int parse_res;
-
-  if (use_nisplus) /* Do the NIS+ query here */
-    {
-      nis_result *res;
-      char buf[strlen (name) + 24 + grptablelen];
-
-      sprintf(buf, "[name=%s],%s", name, grptable);
-      res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
-      if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
-        {
-          enum nss_status status =  niserr2nss (res->status);
-
-          nis_freeresult (res);
-          return status;
-        }
-      parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer, buflen,
-					    errnop);
-      if (parse_res == -1)
-	{
-	  nis_freeresult (res);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      nis_freeresult (res);
-    }
-  else /* Use NIS */
-    {
-      char *domain, *outval, *p;
-      int outvallen;
-
-      if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (yp_match (domain, "group.byname", name, strlen (name),
-		    &outval, &outvallen) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (buflen < ((size_t) outvallen + 1))
-	{
-	  free (outval);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
+  if (!nss_getgrnam_r)
+    return NSS_STATUS_UNAVAIL;
 
-      /* Copy the found data to our buffer...  */
-      p = strncpy (buffer, outval, buflen);
+  if (nss_getgrnam_r (name, result, buffer, buflen, errnop) !=
+      NSS_STATUS_SUCCESS)
+    return NSS_STATUS_NOTFOUND;
 
-      /* ... and free the data.  */
-      free (outval);
-      while (isspace (*p))
-        ++p;
-      parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	return NSS_STATUS_TRYAGAIN;
-    }
+  if (in_blacklist (result->gr_name, strlen (result->gr_name), ent))
+    return NSS_STATUS_NOTFOUND;
 
-  if (parse_res)
-    /* We found the entry.  */
-    return NSS_STATUS_SUCCESS;
-  else
-    return NSS_STATUS_RETURN;
+  /* We found the entry.  */
+  return NSS_STATUS_SUCCESS;
 }
 
 static enum nss_status
@@ -501,9 +270,9 @@ getgrent_next_file (struct group *result, ent_t *ent,
 	  while (isspace (*p))
 	    ++p;
 	}
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
-      /* Parse the line.  If it is invalid, loop to
-         get the next line of the file to parse.  */
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines. */
+	     /* Parse the line.  If it is invalid, loop to
+	        get the next line of the file to parse.  */
 	     !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
 						   errnop)));
 
@@ -531,41 +300,36 @@ getgrent_next_file (struct group *result, ent_t *ent,
       if (result->gr_name[0] == '+' && result->gr_name[1] != '\0'
 	  && result->gr_name[1] != '@')
 	{
-          enum nss_status status;
+	  enum nss_status status;
 
 	  /* Store the group in the blacklist for the "+" at the end of
 	     /etc/group */
 	  blacklist_store_name (&result->gr_name[1], ent);
-	  status = getgrnam_plusgroup (&result->gr_name[1], result, buffer,
-				       buflen, errnop);
-          if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
-            break;
-          else
-            if (status == NSS_STATUS_RETURN /* We couldn't parse the entry */
-		|| status == NSS_STATUS_NOTFOUND) /* No group in NIS */
-              continue;
-            else
-	      {
-		if (status == NSS_STATUS_TRYAGAIN)
-		  {
-		    /* The parser ran out of space.  */
-		    fsetpos (ent->stream, &pos);
-		    *errnop = ERANGE;
-		  }
-		return status;
-	      }
+	  status = getgrnam_plusgroup (&result->gr_name[1], result, ent,
+				       buffer, buflen, errnop);
+	  if (status == NSS_STATUS_SUCCESS)	/* We found the entry. */
+	    break;
+	  else if (status == NSS_STATUS_RETURN	/* We couldn't parse the entry */
+		   || status == NSS_STATUS_NOTFOUND)	/* No group in NIS */
+	    continue;
+	  else
+	    {
+	      if (status == NSS_STATUS_TRYAGAIN)
+		{
+		  /* The parser ran out of space.  */
+		  fsetpos (ent->stream, &pos);
+		  *errnop = ERANGE;
+		}
+	      return status;
+	    }
 	}
 
       /* +:... */
       if (result->gr_name[0] == '+' && result->gr_name[1] == '\0')
 	{
-	  ent->nis = TRUE;
-	  ent->nis_first = TRUE;
+	  ent->files = FALSE;
 
-	  if (use_nisplus)
-	    return getgrent_next_nisplus (result, ent, buffer, buflen, errnop);
-	  else
-	    return getgrent_next_nis (result, ent, buffer, buflen, errnop);
+	  return getgrent_next_nss (result, ent, buffer, buflen, errnop);
 	}
     }
 
@@ -573,39 +337,31 @@ getgrent_next_file (struct group *result, ent_t *ent,
 }
 
 
-static enum nss_status
-internal_getgrent_r (struct group *gr, ent_t *ent, char *buffer,
-		     size_t buflen, int *errnop)
-{
-  if (ent->nis)
-    {
-      if (use_nisplus)
-	return getgrent_next_nisplus (gr, ent, buffer, buflen, errnop);
-      else
-	return getgrent_next_nis (gr, ent, buffer, buflen, errnop);
-    }
-  else
-    return getgrent_next_file (gr, ent, buffer, buflen, errnop);
-}
-
 enum nss_status
 _nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen,
 			int *errnop)
 {
-  enum nss_status status = NSS_STATUS_SUCCESS;
+  enum nss_status result = NSS_STATUS_SUCCESS;
 
   __libc_lock_lock (lock);
 
   /* Be prepared that the setgrent function was not called before.  */
-  if (ext_ent.stream == NULL)
-    status = internal_setgrent (&ext_ent);
+  if (ni == NULL)
+    init_nss_interface ();
 
-  if (status == NSS_STATUS_SUCCESS)
-    status = internal_getgrent_r (grp, &ext_ent, buffer, buflen, errnop);
+  if (ext_ent.stream == NULL)
+    result = internal_setgrent (&ext_ent, 1);
 
+  if (result == NSS_STATUS_SUCCESS)
+    {
+      if (ext_ent.files)
+	result = getgrent_next_file (grp, &ext_ent, buffer, buflen, errnop);
+      else
+	result = getgrent_next_nss (grp, &ext_ent, buffer, buflen, errnop);
+    }
   __libc_lock_unlock (lock);
 
-  return status;
+  return result;
 }
 
 /* Searches in /etc/group and the NIS/NIS+ map for a special group */
@@ -626,7 +382,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
 	  buffer[buflen - 1] = '\xff';
 	  p = fgets (buffer, buflen, ent->stream);
 	  if (p == NULL && feof (ent->stream))
-	      return NSS_STATUS_NOTFOUND;
+	    return NSS_STATUS_NOTFOUND;
 
 	  if (p == NULL || buffer[buflen - 1] != '\xff')
 	    {
@@ -642,9 +398,9 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
 	  while (isspace (*p))
 	    ++p;
 	}
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
-      /* Parse the line.  If it is invalid, loop to
-         get the next line of the file to parse.  */
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines. */
+	     /* Parse the line.  If it is invalid, loop to
+	        get the next line of the file to parse.  */
 	     !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
 						   errnop)));
 
@@ -681,8 +437,8 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
 	    {
 	      enum nss_status status;
 
-	      status = getgrnam_plusgroup (name, result, buffer, buflen,
-					   errnop);
+	      status = getgrnam_plusgroup (name, result, ent,
+					   buffer, buflen, errnop);
 	      if (status == NSS_STATUS_RETURN)
 		/* We couldn't parse the entry */
 		continue;
@@ -695,7 +451,8 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
 	{
 	  enum nss_status status;
 
-	  status = getgrnam_plusgroup (name, result, buffer, buflen, errnop);
+	  status = getgrnam_plusgroup (name, result, ent,
+				       buffer, buflen, errnop);
 	  if (status == NSS_STATUS_RETURN)
 	    /* We couldn't parse the entry */
 	    continue;
@@ -711,99 +468,27 @@ enum nss_status
 _nss_compat_getgrnam_r (const char *name, struct group *grp,
 			char *buffer, size_t buflen, int *errnop)
 {
-  ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
-  enum nss_status status;
+  ent_t ent = {0, TRUE, NULL, {NULL, 0, 0}};
+  enum nss_status result;
 
   if (name[0] == '-' || name[0] == '+')
     return NSS_STATUS_NOTFOUND;
 
   __libc_lock_lock (lock);
 
-  status = internal_setgrent (&ent);
+  if (ni == NULL)
+    init_nss_interface ();
 
   __libc_lock_unlock (lock);
 
-  if (status != NSS_STATUS_SUCCESS)
-    return status;
+  result = internal_setgrent (&ent, 0);
 
-  status = internal_getgrnam_r (name, grp, &ent, buffer, buflen, errnop);
+  if (result == NSS_STATUS_SUCCESS)
+    result = internal_getgrnam_r (name, grp, &ent, buffer, buflen, errnop);
 
   internal_endgrent (&ent);
 
-  return status;
-}
-
-/* This function handle the + entry in /etc/group */
-static enum nss_status
-getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer,
-		    size_t buflen, int *errnop)
-{
-  struct parser_data *data = (void *) buffer;
-  int parse_res;
-
-  if (use_nisplus) /* Do the NIS+ query here */
-    {
-      nis_result *res;
-      char buf[24 + grptablelen];
-
-      sprintf(buf, "[gid=%lu],%s", (unsigned long int) gid, grptable);
-      res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
-      if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
-        {
-          enum nss_status status =  niserr2nss (res->status);
-
-          nis_freeresult (res);
-          return status;
-        }
-      if ((parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer,
-						 buflen, errnop)) == -1)
-	{
-	  nis_freeresult (res);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      nis_freeresult (res);
-    }
-  else /* Use NIS */
-    {
-      char buf[24];
-      char *domain, *outval, *p;
-      int outvallen;
-
-      if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      snprintf (buf, sizeof (buf), "%lu", (unsigned long int) gid);
-
-      if (yp_match (domain, "group.bygid", buf, strlen (buf),
-		    &outval, &outvallen) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (buflen < ((size_t) outvallen + 1))
-	{
-	  free (outval);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      /* Copy the found data to our buffer...  */
-      p = strncpy (buffer, outval, buflen);
-
-      /* ... and free the data.  */
-      free (outval);
-
-      while (isspace (*p))
-        p++;
-      parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	return NSS_STATUS_TRYAGAIN;
-    }
-
-  if (parse_res)
-    /* We found the entry.  */
-    return NSS_STATUS_SUCCESS;
-  else
-    return NSS_STATUS_RETURN;
+  return result;
 }
 
 /* Searches in /etc/group and the NIS/NIS+ map for a special group id */
@@ -840,9 +525,9 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
 	  while (isspace (*p))
 	    ++p;
 	}
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
-      /* Parse the line.  If it is invalid, loop to
-         get the next line of the file to parse.  */
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines. */
+	     /* Parse the line.  If it is invalid, loop to
+	        get the next line of the file to parse.  */
 	     !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
 						   errnop)));
 
@@ -866,8 +551,8 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
       /* -group */
       if (result->gr_name[0] == '-' && result->gr_name[1] != '\0')
 	{
-          blacklist_store_name (&result->gr_name[1], ent);
-          continue;
+	  blacklist_store_name (&result->gr_name[1], ent);
+	  continue;
 	}
 
       /* +group */
@@ -876,10 +561,10 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
 	  enum nss_status status;
 
 	  /* Store the group in the blacklist for the "+" at the end of
-             /etc/group */
-          blacklist_store_name (&result->gr_name[1], ent);
-	  status = getgrnam_plusgroup (&result->gr_name[1], result, buffer,
-				      buflen, errnop);
+	     /etc/group */
+	  blacklist_store_name (&result->gr_name[1], ent);
+	  status = getgrnam_plusgroup (&result->gr_name[1], result, ent,
+				       buffer, buflen, errnop);
 	  if (status == NSS_STATUS_SUCCESS && result->gr_gid == gid)
 	    break;
 	  else
@@ -890,7 +575,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
 	{
 	  enum nss_status status;
 
-	  status = getgrgid_plusgroup (gid, result, buffer, buflen, errnop);
+	  status = nss_getgrgid_r (gid, result, buffer, buflen, errnop);
 	  if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
 	    return NSS_STATUS_NOTFOUND;
 	  else
@@ -905,23 +590,24 @@ enum nss_status
 _nss_compat_getgrgid_r (gid_t gid, struct group *grp,
 			char *buffer, size_t buflen, int *errnop)
 {
-  ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
-  enum nss_status status;
+  ent_t ent = {0, TRUE, NULL, {NULL, 0, 0}};
+  enum nss_status result;
 
   __libc_lock_lock (lock);
 
-  status = internal_setgrent (&ent);
+  if (ni == NULL)
+    init_nss_interface ();
 
   __libc_lock_unlock (lock);
 
-  if (status != NSS_STATUS_SUCCESS)
-    return status;
+  result = internal_setgrent (&ent, 0);
 
-  status = internal_getgrgid_r (gid, grp, &ent, buffer, buflen, errnop);
+  if (result == NSS_STATUS_SUCCESS)
+    result = internal_getgrgid_r (gid, grp, &ent, buffer, buflen, errnop);
 
   internal_endgrent (&ent);
 
-  return status;
+  return result;
 }
 
 
@@ -983,7 +669,7 @@ in_blacklist (const char *name, int namelen, ent_t *ent)
 
   buf[0] = '|';
   cp = stpcpy (&buf[1], name);
-  *cp++= '|';
+  *cp++ = '|';
   *cp = '\0';
   return strstr (ent->blacklist.data, buf) != NULL;
 }
diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c
index 824612286a..ed198325d8 100644
--- a/nis/nss_compat/compat-initgroups.c
+++ b/nis/nss_compat/compat-initgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
@@ -17,6 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#if 0 /* XXX this one needs to be rewritten.  */
+
 #include <errno.h>
 #include <fcntl.h>
 #include <nss.h>
@@ -718,3 +720,5 @@ in_blacklist (const char *name, int namelen, ent_t *ent)
   *cp = '\0';
   return strstr (ent->blacklist.data, buf) != NULL;
 }
+
+#endif
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 5c9a551d88..c47ad31e46 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2001,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
 
@@ -24,20 +24,24 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <string.h>
-#include <bits/libc-lock.h>
-#include <rpcsvc/yp.h>
+#include <rpc/types.h>
 #include <rpcsvc/ypclnt.h>
-#include <rpcsvc/nis.h>
+#include <bits/libc-lock.h>
 #include <nsswitch.h>
 
 #include "netgroup.h"
-#include "nss-nisplus.h"
-#include "nisplus-parser.h"
 
 static service_user *ni;
-static bool_t use_nisplus; /* default: passwd_compat: nis */
-static nis_name pwdtable; /* Name of the pwd table */
-static size_t pwdtablelen;
+static enum nss_status (*nss_setpwent) (int stayopen);
+static enum nss_status (*nss_getpwnam_r) (const char *name,
+					  struct passwd * pwd, char *buffer,
+					  size_t buflen, int *errnop);
+static enum nss_status (*nss_getpwuid_r) (uid_t uid, struct passwd * pwd,
+					  char *buffer, size_t buflen,
+					  int *errnop);
+static enum nss_status (*nss_getpwent_r) (struct passwd * pwd, char *buffer,
+					  size_t buflen, int *errnop);
+static enum nss_status (*nss_endpwent) (void);
 
 /* Get the declaration of the parser function.  */
 #define ENTNAME pwent
@@ -49,29 +53,26 @@ static size_t pwdtablelen;
 #define BLACKLIST_INITIAL_SIZE 512
 #define BLACKLIST_INCREMENT 256
 struct blacklist_t
-  {
-    char *data;
-    int current;
-    int size;
-  };
+{
+  char *data;
+  int current;
+  int size;
+};
 
 struct ent_t
-  {
-    bool_t netgroup;
-    bool_t nis;
-    bool_t first;
-    char *oldkey;
-    int oldkeylen;
-    nis_result *result;
-    FILE *stream;
-    struct blacklist_t blacklist;
-    struct passwd pwd;
-    struct __netgrent netgrdata;
-  };
+{
+  bool_t netgroup;
+  bool_t first;
+  bool_t files;
+  FILE *stream;
+  struct blacklist_t blacklist;
+  struct passwd pwd;
+  struct __netgrent netgrdata;
+};
 typedef struct ent_t ent_t;
 
-static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
-			{NULL, NULL, 0, 0, NULL, NULL, NULL}};
+static ent_t ext_ent = {0, 0, TRUE, NULL, {NULL, 0, 0},
+                        {NULL, NULL, 0, 0, NULL, NULL, NULL}};
 
 /* Protect global state against multiple changers.  */
 __libc_lock_define_initialized (static, lock)
@@ -80,6 +81,21 @@ __libc_lock_define_initialized (static, lock)
 static void blacklist_store_name (const char *, ent_t *);
 static int in_blacklist (const char *, int, ent_t *);
 
+/* Initialize the NSS interface/functions. The calling function must
+   hold the lock.  */
+static void
+init_nss_interface (void)
+{
+  if (__nss_database_lookup ("passwd_compat", NULL, "nis", &ni) >= 0)
+    {
+      nss_setpwent = __nss_lookup_function (ni, "setpwent");
+      nss_getpwnam_r = __nss_lookup_function (ni, "getpwnam_r");
+      nss_getpwuid_r = __nss_lookup_function (ni, "getpwuid_r");
+      nss_getpwent_r = __nss_lookup_function (ni, "getpwent_r");
+      nss_endpwent = __nss_lookup_function (ni, "endpwent");
+    }
+}
+
 static void
 give_pwd_free (struct passwd *pwd)
 {
@@ -156,8 +172,7 @@ copy_pwd_changes (struct passwd *dest, struct passwd *src,
     {
       if (buffer == NULL)
 	dest->pw_dir = strdup (src->pw_dir);
-      else if (dest->pw_dir &&
-	       strlen (dest->pw_dir) >= strlen (src->pw_dir))
+      else if (dest->pw_dir && strlen (dest->pw_dir) >= strlen (src->pw_dir))
 	strcpy (dest->pw_dir, src->pw_dir);
       else
 	{
@@ -186,100 +201,17 @@ copy_pwd_changes (struct passwd *dest, struct passwd *src,
 }
 
 static enum nss_status
-insert_passwd_adjunct (char **result, int *len, char *domain, int *errnop)
-{
-  char *p1, *p2, *result2, *res;
-  int len2;
-  size_t namelen;
-
-  /* Check for adjunct style secret passwords.  They can be
-     recognized by a password starting with "##".  */
-  p1 = strchr (*result, ':');
-  if (p1 == NULL || p1[1] != '#' || p1[2] != '#')
-    return NSS_STATUS_SUCCESS;
-  p2 = strchr (p1 + 3, ':');
-
-  namelen = p2 - p1 - 3;
-
-  if (yp_match (domain, "passwd.adjunct.byname", &p1[3], namelen,
-		&result2, &len2) == YPERR_SUCCESS)
-    {
-      /* We found a passwd.adjunct entry.  Merge encrypted
-	 password therein into original result.  */
-      char *encrypted = strchr (result2, ':');
-      char *endp;
-      size_t restlen;
-
-      if (encrypted == NULL || (endp = strchr (++encrypted, ':')) == NULL)
-	{
-	  /* Invalid format of the entry.  This never should happen
-	     unless the data from which the NIS table is generated is
-	     wrong.  We simply ignore it.  */
-	  free (result2);
-	  return NSS_STATUS_SUCCESS;
-	}
-
-      restlen = *len - (p2 - *result);
-      if ((res = malloc (namelen + restlen + (endp - encrypted) + 2)) == NULL)
-	{
-	  free (result2);
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      __mempcpy (__mempcpy (__mempcpy (__mempcpy
-				       (res, *result, (p1 - *result)),
-				       ":", 1),
-			    encrypted, endp - encrypted),
-		 p2, restlen + 1);
-
-      free (result2);
-      free (*result);
-      *result = res;
-      *len = strlen (res);
-    }
-  return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-internal_setpwent (ent_t *ent)
+internal_setpwent (ent_t *ent, int stayopen)
 {
   enum nss_status status = NSS_STATUS_SUCCESS;
 
-  ent->nis = ent->first = ent->netgroup = 0;
+  ent->first = ent->netgroup = FALSE;
+  ent->files = TRUE;
 
   /* If something was left over free it.  */
   if (ent->netgroup)
     __internal_endnetgrent (&ent->netgrdata);
 
-  if (ent->oldkey != NULL)
-    {
-      free (ent->oldkey);
-      ent->oldkey = NULL;
-      ent->oldkeylen = 0;
-    }
-
-  if (ent->result != NULL)
-    {
-      nis_freeresult (ent->result);
-      ent->result = NULL;
-    }
-
-  if (pwdtable == NULL)
-    {
-      static const char key[] = "passwd.org_dir.";
-      const char *local_dir = nis_local_directory ();
-      size_t len_local_dir = strlen (local_dir);
-
-      pwdtable = malloc (sizeof (key) + len_local_dir);
-      if (pwdtable == NULL)
-        return NSS_STATUS_TRYAGAIN;
-
-      pwdtablelen = ((char *) mempcpy (mempcpy (pwdtable,
-						key, sizeof (key) - 1),
-				       local_dir, len_local_dir + 1)
-		     - pwdtable) - 1;
-    }
-
   if (ent->blacklist.data != NULL)
     {
       ent->blacklist.current = 1;
@@ -309,7 +241,7 @@ internal_setpwent (ent_t *ent)
 	  if (result < 0)
 	    {
 	      /* Something went wrong.  Close the stream and return a
-		 failure.  */
+	         failure.  */
 	      fclose (ent->stream);
 	      ent->stream = NULL;
 	      status = NSS_STATUS_UNAVAIL;
@@ -321,6 +253,9 @@ internal_setpwent (ent_t *ent)
 
   give_pwd_free (&ent->pwd);
 
+  if (status == NSS_STATUS_SUCCESS && nss_setpwent)
+    return nss_setpwent (stayopen);
+
   return status;
 }
 
@@ -333,12 +268,9 @@ _nss_compat_setpwent (int stayopen)
   __libc_lock_lock (lock);
 
   if (ni == NULL)
-    {
-      __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
 
-  result = internal_setpwent (&ext_ent);
+  result = internal_setpwent (&ext_ent, stayopen);
 
   __libc_lock_unlock (lock);
 
@@ -349,6 +281,9 @@ _nss_compat_setpwent (int stayopen)
 static enum nss_status
 internal_endpwent (ent_t *ent)
 {
+  if (nss_endpwent)
+    nss_endpwent ();
+
   if (ent->stream != NULL)
     {
       fclose (ent->stream);
@@ -358,26 +293,13 @@ internal_endpwent (ent_t *ent)
   if (ent->netgroup)
     __internal_endnetgrent (&ent->netgrdata);
 
-  ent->nis = ent->first = ent->netgroup = 0;
-
-  if (ent->oldkey != NULL)
-    {
-      free (ent->oldkey);
-      ent->oldkey = NULL;
-      ent->oldkeylen = 0;
-    }
-
-  if (ent->result != NULL)
-    {
-      nis_freeresult (ent->result);
-      ent->result = NULL;
-    }
+  ent->first = ent->netgroup = FALSE;
 
   if (ent->blacklist.data != NULL)
     {
       ent->blacklist.current = 1;
       ent->blacklist.data[0] = '|';
-     ent->blacklist.data[1] = '\0';
+      ent->blacklist.data[1] = '\0';
     }
   else
     ent->blacklist.current = 0;
@@ -401,19 +323,25 @@ _nss_compat_endpwent (void)
   return result;
 }
 
+
 static enum nss_status
-getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent,
-			 char *group, char *buffer, size_t buflen, int *errnop)
+getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent,
+			 char *group, char *buffer, size_t buflen,
+			 int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
-  char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
-  int status, outvallen;
+  char *curdomain, *host, *user, *domain, *p2;
+  int status;
   size_t p2len;
 
-  if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
+  /* Leave function if NSS module does not support getpwnam_r,
+     we need this function here.  */
+  if (!nss_getpwnam_r)
+    return NSS_STATUS_UNAVAIL;
+
+  if (yp_get_default_domain (&curdomain) != YPERR_SUCCESS)
     {
-      ent->netgroup = 0;
-      ent->first = 0;
+      ent->netgroup = FALSE;
+      ent->first = FALSE;
       give_pwd_free (&ent->pwd);
       return NSS_STATUS_UNAVAIL;
     }
@@ -428,7 +356,6 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent,
   while (1)
     {
       char *saved_cursor;
-      int parse_res;
 
       saved_cursor = ent->netgrdata.cursor;
       status = __internal_getnetgrent_r (&host, &user, &domain,
@@ -445,7 +372,7 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent,
       if (user == NULL || user[0] == '-')
 	continue;
 
-      if (domain != NULL && strcmp (ypdomain, domain) != 0)
+      if (domain != NULL && strcmp (curdomain, domain) != 0)
 	continue;
 
       /* If name != NULL, we are called from getpwnam.  */
@@ -453,148 +380,23 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent,
 	if (strcmp (user, name) != 0)
 	  continue;
 
-      if (yp_match (ypdomain, "passwd.byname", user,
-		    strlen (user), &outval, &outvallen)
-	  != YPERR_SUCCESS)
-	continue;
-
-      if (insert_passwd_adjunct (&outval, &outvallen, ypdomain, errnop)
-	  != NSS_STATUS_SUCCESS)
-	{
-	  free (outval);
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
       p2len = pwd_need_buflen (&ent->pwd);
       if (p2len > buflen)
 	{
-	  free (outval);
 	  *errnop = ERANGE;
 	  return NSS_STATUS_TRYAGAIN;
 	}
       p2 = buffer + (buflen - p2len);
       buflen -= p2len;
 
-      if (buflen < ((size_t) outvallen + 1))
-	{
-	  free (outval);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      p = strncpy (buffer, outval, buflen);
-
-      while (isspace (*p))
-	p++;
-      free (outval);
-      parse_res = _nss_files_parse_pwent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	{
-	  ent->netgrdata.cursor = saved_cursor;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      if (parse_res && !in_blacklist (result->pw_name,
-				      strlen (result->pw_name), ent))
-	{
-	  /* Store the User in the blacklist for the "+" at the end of
-	     /etc/passwd */
-	  blacklist_store_name (result->pw_name, ent);
-	  copy_pwd_changes (result, &ent->pwd, p2, p2len);
-	  break;
-	}
-    }
-
-  return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getpwent_next_nisplus_netgr (const char *name, struct passwd *result,
-			     ent_t *ent, char *group, char *buffer,
-			     size_t buflen, int *errnop)
-{
-  char *ypdomain, *host, *user, *domain, *p2;
-  int status, parse_res;
-  size_t p2len;
-  nis_result *nisres;
-
-  /* Maybe we should use domainname here ? We need the current
-     domainname for the domain field in netgroups */
-  if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
-    {
-      ent->netgroup = 0;
-      ent->first = 0;
-      give_pwd_free (&ent->pwd);
-      return NSS_STATUS_UNAVAIL;
-    }
-
-  if (ent->first == TRUE)
-    {
-      bzero (&ent->netgrdata, sizeof (struct __netgrent));
-      __internal_setnetgrent (group, &ent->netgrdata);
-      ent->first = FALSE;
-    }
-
-  while (1)
-    {
-      char *saved_cursor;
-
-      saved_cursor = ent->netgrdata.cursor;
-      status = __internal_getnetgrent_r (&host, &user, &domain,
-					 &ent->netgrdata, buffer, buflen,
-					 errnop);
-      if (status != 1)
-	{
-	  __internal_endnetgrent (&ent->netgrdata);
-	  ent->netgroup = 0;
-	  give_pwd_free (&ent->pwd);
-	  return NSS_STATUS_RETURN;
-	}
-
-      if (user == NULL || user[0] == '-')
+      if (nss_getpwnam_r (user, result, buffer, buflen, errnop) !=
+	  NSS_STATUS_SUCCESS)
 	continue;
 
-      if (domain != NULL && strcmp (ypdomain, domain) != 0)
-	continue;
-
-      /* If name != NULL, we are called from getpwnam */
-      if (name != NULL)
-	if (strcmp (user, name) != 0)
-	  continue;
-
-      p2len = pwd_need_buflen (&ent->pwd);
-      if (p2len > buflen)
-	{
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      p2 = buffer + (buflen - p2len);
-      buflen -= p2len;
-      {
-	char buf[strlen (user) + 30 + pwdtablelen];
-	sprintf(buf, "[name=%s],%s", user, pwdtable);
-	nisres = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
-      }
-      if (niserr2nss (nisres->status) != NSS_STATUS_SUCCESS)
-	{
-	  nis_freeresult (nisres);
-	  continue;
-	}
-      parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer,
-					    buflen, errnop);
-      if (parse_res == -1)
-	{
-	  nis_freeresult (nisres);
-	  ent->netgrdata.cursor = saved_cursor;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      nis_freeresult (nisres);
-
-      if (parse_res && !in_blacklist (result->pw_name,
-				      strlen (result->pw_name), ent))
+      if (!in_blacklist (result->pw_name, strlen (result->pw_name), ent))
 	{
-	  /* Store the User in the blacklist for the "+" at the end of
-	     /etc/passwd */
+	  /* Store the User in the blacklist for possible the "+" at the
+	     end of /etc/passwd */
 	  blacklist_store_name (result->pw_name, ent);
 	  copy_pwd_changes (result, &ent->pwd, p2, p2len);
 	  break;
@@ -604,100 +406,18 @@ getpwent_next_nisplus_netgr (const char *name, struct passwd *result,
   return NSS_STATUS_SUCCESS;
 }
 
-/* get the next user from NIS+  (+ entry) */
+/* get the next user from NSS  (+ entry) */
 static enum nss_status
-getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
-		       size_t buflen, int *errnop)
-{
-  int parse_res;
-  size_t p2len;
-  char *p2;
-
-  p2len = pwd_need_buflen (&ent->pwd);
-  if (p2len > buflen)
-    {
-      *errnop = ERANGE;
-      return NSS_STATUS_TRYAGAIN;
-    }
-  p2 = buffer + (buflen - p2len);
-  buflen -= p2len;
-  do
-    {
-      bool_t saved_first;
-      nis_result *saved_res;
-
-      if (ent->first)
-	{
-	  saved_first = TRUE;
-	  saved_res = ent->result;
-
-	  ent->result = nis_first_entry (pwdtable);
-          if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      give_pwd_free (&ent->pwd);
-	      return niserr2nss (ent->result->status);
-	    }
-	  ent->first = FALSE;
-	}
-      else
-	{
-	  nis_result *res;
-
-	  res = nis_next_entry (pwdtable, &ent->result->cookie);
-	  saved_res = ent->result;
-	  saved_first = FALSE;
-	  ent->result = res;
-	  if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      nis_freeresult (saved_res);
-	      give_pwd_free (&ent->pwd);
-	      return niserr2nss (ent->result->status);
-	    }
-	}
-      parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
-					    buflen, errnop);
-      if (parse_res == -1)
-	{
-	  nis_freeresult (ent->result);
-	  ent->result = saved_res;
-	  ent->first = saved_first;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  if (!saved_first)
-	    nis_freeresult (saved_res);
-	}
-
-      if (parse_res &&
-	  in_blacklist (result->pw_name, strlen (result->pw_name), ent))
-	parse_res = 0; /* if result->pw_name in blacklist,search next entry */
-    }
-  while (!parse_res);
-
-  copy_pwd_changes (result, &ent->pwd, p2, p2len);
-
-  return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer,
+getpwent_next_nss (struct passwd *result, ent_t *ent, char *buffer,
 		   size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
-  char *domain, *outkey, *outval, *p, *p2;
-  int outkeylen, outvallen, parse_res;
+  enum nss_status status;
+  char *p2;
   size_t p2len;
 
-  if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-    {
-      ent->nis = 0;
-      give_pwd_free (&ent->pwd);
-      return NSS_STATUS_UNAVAIL;
-    }
+  /* Return if NSS module does not support getpwent_r.  */
+  if (!nss_getpwent_r)
+    return NSS_STATUS_UNAVAIL;
 
   p2len = pwd_need_buflen (&ent->pwd);
   if (p2len > buflen)
@@ -707,103 +427,17 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer,
     }
   p2 = buffer + (buflen - p2len);
   buflen -= p2len;
-  do
-    {
-      bool_t saved_first;
-      char *saved_oldkey;
-      int saved_oldlen;
 
-      if (ent->first)
-	{
-	  if (yp_first (domain, "passwd.byname", &outkey, &outkeylen,
-			&outval, &outvallen) != YPERR_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      give_pwd_free (&ent->pwd);
-	      return NSS_STATUS_UNAVAIL;
-	    }
+  if (ent->first)
+    ent->first = FALSE;
 
-	  if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop) !=
-	      NSS_STATUS_SUCCESS)
-	    {
-	      free (outval);
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  if (buflen < ((size_t) outvallen + 1))
-	    {
-	      free (outval);
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  saved_first = TRUE;
-	  saved_oldkey = ent->oldkey;
-	  saved_oldlen = ent->oldkeylen;
-	  ent->oldkey = outkey;
-	  ent->oldkeylen = outkeylen;
-	  ent->first = FALSE;
-	}
-      else
-	{
-	  if (yp_next (domain, "passwd.byname", ent->oldkey, ent->oldkeylen,
-		       &outkey, &outkeylen, &outval, &outvallen)
-	      != YPERR_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      give_pwd_free (&ent->pwd);
-	      return NSS_STATUS_NOTFOUND;
-	    }
-
-	  if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop)
-	      != NSS_STATUS_SUCCESS)
-	    {
-	      free (outval);
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  if (buflen < ((size_t) outvallen + 1))
-	    {
-	      free (outval);
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  saved_first = FALSE;
-	  saved_oldkey = ent->oldkey;
-	  saved_oldlen = ent->oldkeylen;
-	  ent->oldkey = outkey;
-	  ent->oldkeylen = outkeylen;
-	}
-
-      /* Copy the found data to our buffer  */
-      p = strncpy (buffer, outval, buflen);
-
-      /* ...and free the data.  */
-      free (outval);
-
-      while (isspace (*p))
-	++p;
-      parse_res = _nss_files_parse_pwent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	{
-	  free (ent->oldkey);
-	  ent->oldkey = saved_oldkey;
-	  ent->oldkeylen = saved_oldlen;
-	  ent->first = saved_first;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  if (!saved_first)
-	    free (saved_oldkey);
-	}
-      if (parse_res
-	  && in_blacklist (result->pw_name, strlen (result->pw_name), ent))
-	parse_res = 0;
+  do
+    {
+      if ((status = nss_getpwent_r (result, buffer, buflen, errnop)) !=
+	  NSS_STATUS_SUCCESS)
+	return status;
     }
-  while (!parse_res);
+  while (in_blacklist (result->pw_name, strlen (result->pw_name), ent));
 
   copy_pwd_changes (result, &ent->pwd, p2, p2len);
 
@@ -815,12 +449,13 @@ static enum nss_status
 getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent,
 		   char *buffer, size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
   struct passwd pwd;
-  int parse_res;
   char *p;
   size_t plen;
 
+  if (!nss_getpwnam_r)
+    return NSS_STATUS_UNAVAIL;
+
   memset (&pwd, '\0', sizeof (struct passwd));
 
   copy_pwd_changes (&pwd, result, NULL, 0);
@@ -834,88 +469,17 @@ getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent,
   p = buffer + (buflen - plen);
   buflen -= plen;
 
-  if (use_nisplus) /* Do the NIS+ query here */
-    {
-      nis_result *res;
-      char buf[strlen (name) + 24 + pwdtablelen];
-
-      sprintf(buf, "[name=%s],%s", name, pwdtable);
-      res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
-      if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
-	{
-	  enum nss_status status =  niserr2nss (res->status);
-
-	  nis_freeresult (res);
-	  return status;
-	}
-      parse_res = _nss_nisplus_parse_pwent (res, result, buffer,
-					    buflen, errnop);
-
-      nis_freeresult (res);
-
-      if (parse_res == -1)
-	{
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
-	return NSS_STATUS_NOTFOUND;
-    }
-  else /* Use NIS */
-    {
-      char *domain, *outval, *ptr;
-      int outvallen;
-
-      if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (yp_match (domain, "passwd.byname", name, strlen (name),
-		    &outval, &outvallen) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop)
-	  != NSS_STATUS_SUCCESS)
-	{
-	  free (outval);
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      if (buflen < ((size_t) outvallen + 1))
-	{
-	  free (outval);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      ptr = strncpy (buffer, outval, buflen);
-      free (outval);
-
-      while (isspace (*ptr))
-	ptr++;
-
-      parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop);
-      if (parse_res == -1)
-	return NSS_STATUS_TRYAGAIN;
+  if (nss_getpwnam_r (name, result, buffer, buflen, errnop) !=
+      NSS_STATUS_SUCCESS)
+    return NSS_STATUS_NOTFOUND;
 
-      if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
-	return NSS_STATUS_NOTFOUND;
-    }
+  if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
+    return NSS_STATUS_NOTFOUND;
 
-  if (parse_res > 0)
-    {
-      copy_pwd_changes (result, &pwd, p, plen);
-      give_pwd_free (&pwd);
-      /* We found the entry.  */
-      return NSS_STATUS_SUCCESS;
-    }
-  else
-    {
-      /* Give buffer the old len back */
-      buflen += plen;
-      give_pwd_free (&pwd);
-    }
-  return NSS_STATUS_RETURN;
+  copy_pwd_changes (result, &pwd, p, plen);
+  give_pwd_free (&pwd);
+  /* We found the entry.  */
+  return NSS_STATUS_SUCCESS;
 }
 
 static enum nss_status
@@ -951,9 +515,9 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
 	  while (isspace (*p))
 	    ++p;
 	}
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines.  */
-      /* Parse the line.  If it is invalid, loop to
-         get the next line of the file to parse.  */
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */
+	     /* Parse the line.  If it is invalid, loop to
+	        get the next line of the file to parse.  */
 	     !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
 						   errnop)));
 
@@ -1000,14 +564,9 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
 	  ent->first = TRUE;
 	  copy_pwd_changes (&ent->pwd, result, NULL, 0);
 
-	  if (use_nisplus)
-	    status =  getpwent_next_nisplus_netgr (NULL, result, ent,
-						   &result->pw_name[2],
-						   buffer, buflen, errnop);
-	  else
-	    status =  getpwent_next_nis_netgr (NULL, result, ent,
-					       &result->pw_name[2],
-					       buffer, buflen, errnop);
+	  status = getpwent_next_nss_netgr (NULL, result, ent,
+					    &result->pw_name[2],
+					    buffer, buflen, errnop);
 	  if (status == NSS_STATUS_RETURN)
 	    continue;
 	  else
@@ -1036,35 +595,31 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
 				      buffer, buflen, errnop);
 	  blacklist_store_name (buf, ent);
 
-	  if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
+	  if (status == NSS_STATUS_SUCCESS)	/* We found the entry. */
 	    break;
+	  else if (status == NSS_STATUS_RETURN	/* We couldn't parse the entry */
+		   || status == NSS_STATUS_NOTFOUND)	/* entry doesn't exist */
+	    continue;
 	  else
-	    if (status == NSS_STATUS_RETURN /* We couldn't parse the entry */
-		|| status == NSS_STATUS_NOTFOUND) /* entry doesn't exist */
-	      continue;
-	    else
-	      {
-		if (status == NSS_STATUS_TRYAGAIN)
-		  {
-		    /* The parser ran out of space */
-		    fsetpos (ent->stream, &pos);
-		    *errnop = ERANGE;
-		  }
-		return status;
-	      }
+	    {
+	      if (status == NSS_STATUS_TRYAGAIN)
+		{
+		  /* The parser ran out of space */
+		  fsetpos (ent->stream, &pos);
+		  *errnop = ERANGE;
+		}
+	      return status;
+	    }
 	}
 
       /* +:... */
       if (result->pw_name[0] == '+' && result->pw_name[1] == '\0')
 	{
-	  ent->nis = TRUE;
+	  ent->files = FALSE;
 	  ent->first = TRUE;
 	  copy_pwd_changes (&ent->pwd, result, NULL, 0);
 
-	  if (use_nisplus)
-	    return getpwent_next_nisplus (result, ent, buffer, buflen, errnop);
-	  else
-	    return getpwent_next_nis (result, ent, buffer, buflen, errnop);
+	  return getpwent_next_nss (result, ent, buffer, buflen, errnop);
 	}
     }
 
@@ -1082,53 +637,41 @@ internal_getpwent_r (struct passwd *pw, ent_t *ent, char *buffer,
 
       /* We are searching members in a netgroup */
       /* Since this is not the first call, we don't need the group name */
-      if (use_nisplus)
-	status = getpwent_next_nisplus_netgr (NULL, pw, ent, NULL, buffer,
-					      buflen, errnop);
-      else
-	status = getpwent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen,
-					  errnop);
+      status = getpwent_next_nss_netgr (NULL, pw, ent, NULL, buffer, buflen,
+					errnop);
       if (status == NSS_STATUS_RETURN)
 	return getpwent_next_file (pw, ent, buffer, buflen, errnop);
       else
 	return status;
     }
+  else if (ent->files)
+    return getpwent_next_file (pw, ent, buffer, buflen, errnop);
   else
-    if (ent->nis)
-      {
-	if (use_nisplus)
-	  return getpwent_next_nisplus (pw, ent, buffer, buflen, errnop);
-	else
-	  return getpwent_next_nis (pw, ent, buffer, buflen, errnop);
-      }
-    else
-      return getpwent_next_file (pw, ent, buffer, buflen, errnop);
+    return getpwent_next_nss (pw, ent, buffer, buflen, errnop);
+
 }
 
 enum nss_status
 _nss_compat_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen,
 			int *errnop)
 {
-  enum nss_status status = NSS_STATUS_SUCCESS;
+  enum nss_status result = NSS_STATUS_SUCCESS;
 
   __libc_lock_lock (lock);
 
+  /* Be prepared that the setpwent function was not called before.  */
   if (ni == NULL)
-    {
-      __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
 
-  /* Be prepared that the setpwent function was not called before.  */
   if (ext_ent.stream == NULL)
-    status = internal_setpwent (&ext_ent);
+    result = internal_setpwent (&ext_ent, 1);
 
-  if (status == NSS_STATUS_SUCCESS)
-    status = internal_getpwent_r (pwd, &ext_ent, buffer, buflen, errnop);
+  if (result == NSS_STATUS_SUCCESS)
+    result = internal_getpwent_r (pwd, &ext_ent, buffer, buflen, errnop);
 
   __libc_lock_unlock (lock);
 
-  return status;
+  return result;
 }
 
 /* Searches in /etc/passwd and the NIS/NIS+ map for a special user */
@@ -1167,9 +710,9 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent,
 	  while (isspace (*p))
 	    ++p;
 	}
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines.  */
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */
 	     /* Parse the line.  If it is invalid, loop to
-		get the next line of the file to parse.  */
+	        get the next line of the file to parse.  */
 	     !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
 						   errnop)));
 
@@ -1210,8 +753,8 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent,
 	      status = getpwnam_plususer (name, result, ent, buffer,
 					  buflen, errnop);
 
-              if (status == NSS_STATUS_RETURN)
-                continue;
+	      if (status == NSS_STATUS_RETURN)
+		continue;
 
 	      return status;
 	    }
@@ -1253,13 +796,12 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent,
 
 	  status = getpwnam_plususer (name, result, ent,
 				      buffer, buflen, errnop);
-	  if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
+	  if (status == NSS_STATUS_SUCCESS)	/* We found the entry. */
 	    break;
+	  else if (status == NSS_STATUS_RETURN)	/* We couldn't parse the entry */
+	    return NSS_STATUS_NOTFOUND;
 	  else
-	    if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
-	      return NSS_STATUS_NOTFOUND;
-	    else
-	      return status;
+	    return status;
 	}
     }
   return NSS_STATUS_SUCCESS;
@@ -1269,9 +811,9 @@ enum nss_status
 _nss_compat_getpwnam_r (const char *name, struct passwd *pwd,
 			char *buffer, size_t buflen, int *errnop)
 {
-  ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
-	       {NULL, NULL, 0, 0, NULL, NULL, NULL}};
-  enum nss_status status;
+  enum nss_status result;
+  ent_t ent = {0, 0, TRUE, NULL, {NULL, 0, 0},
+               {NULL, NULL, 0, 0, NULL, NULL, NULL}};
 
   if (name[0] == '-' || name[0] == '+')
     return NSS_STATUS_NOTFOUND;
@@ -1279,35 +821,32 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd,
   __libc_lock_lock (lock);
 
   if (ni == NULL)
-    {
-      __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
 
   __libc_lock_unlock (lock);
 
-  status = internal_setpwent (&ent);
-  if (status != NSS_STATUS_SUCCESS)
-    return status;
+  result = internal_setpwent (&ent, 0);
 
-  status = internal_getpwnam_r (name, pwd, &ent, buffer, buflen, errnop);
+  if (result == NSS_STATUS_SUCCESS)
+    result = internal_getpwnam_r (name, pwd, &ent, buffer, buflen, errnop);
 
   internal_endpwent (&ent);
 
-  return status;
+  return result;
 }
 
 /* This function handle the + entry in /etc/passwd for getpwuid */
 static enum nss_status
 getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer,
-                   size_t buflen, int *errnop)
+		   size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
   struct passwd pwd;
-  int parse_res;
   char *p;
   size_t plen;
 
+  if (!nss_getpwuid_r)
+    return NSS_STATUS_UNAVAIL;
+
   memset (&pwd, '\0', sizeof (struct passwd));
 
   copy_pwd_changes (&pwd, result, NULL, 0);
@@ -1321,70 +860,8 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer,
   p = buffer + (buflen - plen);
   buflen -= plen;
 
-  if (use_nisplus) /* Do the NIS+ query here */
-    {
-      nis_result *res;
-      char buf[1024 + pwdtablelen];
-
-      snprintf (buf, sizeof (buf), "[uid=%lu],%s", (unsigned long int) uid,
-                pwdtable);
-      res = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
-      if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
-        {
-          enum nss_status status =  niserr2nss (res->status);
-
-          nis_freeresult (res);
-          return status;
-        }
-      if ((parse_res = _nss_nisplus_parse_pwent (res, result, buffer,
-                                                 buflen, errnop)) == -1)
-        {
-          nis_freeresult (res);
-          *errnop = ERANGE;
-          return NSS_STATUS_TRYAGAIN;
-        }
-      nis_freeresult (res);
-    }
-  else /* Use NIS */
-    {
-      char buf[1024];
-      char *domain, *outval, *ptr;
-      int outvallen;
-
-      if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      sprintf (buf, "%lu", (unsigned long int) uid);
-      if (yp_match (domain, "passwd.byuid", buf, strlen (buf),
-                    &outval, &outvallen)
-          != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop)
-          != NSS_STATUS_SUCCESS)
-        {
-          free (outval);
-          return NSS_STATUS_TRYAGAIN;
-        }
-
-      if (buflen < ((size_t) outvallen + 1))
-        {
-          free (outval);
-          *errnop = ERANGE;
-          return NSS_STATUS_TRYAGAIN;
-        }
-
-      ptr = strncpy (buffer, outval, buflen);
-      free (outval);
-
-      while (isspace (*ptr))
-        ptr++;
-      parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop);
-      if (parse_res == -1)
-        return NSS_STATUS_TRYAGAIN;
-    }
-
-  if (parse_res > 0)
+  if (nss_getpwuid_r (uid, result, buffer, buflen, errnop) ==
+      NSS_STATUS_SUCCESS)
     {
       copy_pwd_changes (result, &pwd, p, plen);
       give_pwd_free (&pwd);
@@ -1400,10 +877,10 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer,
   return NSS_STATUS_RETURN;
 }
 
-/* Searches in /etc/passwd and the NIS/NIS+ map for a special user id */
+/* Searches in /etc/passwd and the NSS subsystem for a special user id */
 static enum nss_status
 internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
-                     char *buffer, size_t buflen, int *errnop)
+		     char *buffer, size_t buflen, int *errnop)
 {
   struct parser_data *data = (void *) buffer;
 
@@ -1414,54 +891,54 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
       int parse_res;
 
       do
-        {
-          fgetpos (ent->stream, &pos);
-          buffer[buflen - 1] = '\xff';
-          p = fgets (buffer, buflen, ent->stream);
-          if (p == NULL && feof (ent->stream))
+	{
+	  fgetpos (ent->stream, &pos);
+	  buffer[buflen - 1] = '\xff';
+	  p = fgets (buffer, buflen, ent->stream);
+	  if (p == NULL && feof (ent->stream))
 	    return NSS_STATUS_NOTFOUND;
 
-          if (p == NULL || buffer[buflen - 1] != '\xff')
-            {
-              fsetpos (ent->stream, &pos);
-              *errnop = ERANGE;
-              return NSS_STATUS_TRYAGAIN;
-            }
-
-          /* Terminate the line for any case.  */
-          buffer[buflen - 1] = '\0';
-
-          /* Skip leading blanks.  */
-          while (isspace (*p))
-            ++p;
-        }
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines.  */
-             /* Parse the line.  If it is invalid, loop to
-                get the next line of the file to parse.  */
-             !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
-                                                   errnop)));
+	  if (p == NULL || buffer[buflen - 1] != '\xff')
+	    {
+	      fsetpos (ent->stream, &pos);
+	      *errnop = ERANGE;
+	      return NSS_STATUS_TRYAGAIN;
+	    }
+
+	  /* Terminate the line for any case.  */
+	  buffer[buflen - 1] = '\0';
+
+	  /* Skip leading blanks.  */
+	  while (isspace (*p))
+	    ++p;
+	}
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */
+	     /* Parse the line.  If it is invalid, loop to
+	        get the next line of the file to parse.  */
+	     !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
+						   errnop)));
 
       if (parse_res == -1)
-        {
-          /* The parser ran out of space.  */
-          fsetpos (ent->stream, &pos);
-          *errnop = ERANGE;
-          return NSS_STATUS_TRYAGAIN;
-        }
+	{
+	  /* The parser ran out of space.  */
+	  fsetpos (ent->stream, &pos);
+	  *errnop = ERANGE;
+	  return NSS_STATUS_TRYAGAIN;
+	}
 
       /* This is a real entry.  */
       if (result->pw_name[0] != '+' && result->pw_name[0] != '-')
-        {
-          if (result->pw_uid == uid)
-            return NSS_STATUS_SUCCESS;
-          else
-            continue;
-        }
+	{
+	  if (result->pw_uid == uid)
+	    return NSS_STATUS_SUCCESS;
+	  else
+	    continue;
+	}
 
       /* -@netgroup */
       if (result->pw_name[0] == '-' && result->pw_name[1] == '@'
-          && result->pw_name[2] != '\0')
-        {
+	  && result->pw_name[2] != '\0')
+	{
 	  char buf[strlen (result->pw_name)];
 	  enum nss_status status;
 
@@ -1472,13 +949,13 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
 	      innetgr (buf, NULL, result->pw_name, NULL))
 	    return NSS_STATUS_NOTFOUND;
 
-          continue;
-        }
+	  continue;
+	}
 
       /* +@netgroup */
       if (result->pw_name[0] == '+' && result->pw_name[1] == '@'
-          && result->pw_name[2] != '\0')
-        {
+	  && result->pw_name[2] != '\0')
+	{
 	  char buf[strlen (result->pw_name)];
 	  enum nss_status status;
 
@@ -1494,19 +971,18 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
 	      if (innetgr (buf, NULL, result->pw_name, NULL))
 		return NSS_STATUS_SUCCESS;
 	    }
+	  else if (status == NSS_STATUS_RETURN)	/* We couldn't parse the entry */
+	    return NSS_STATUS_NOTFOUND;
 	  else
-            if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
-	      return NSS_STATUS_NOTFOUND;
-            else
-              return status;
+	    return status;
 
-          continue;
+	  continue;
 	}
 
       /* -user */
       if (result->pw_name[0] == '-' && result->pw_name[1] != '\0'
-          && result->pw_name[1] != '@')
-        {
+	  && result->pw_name[1] != '@')
+	{
 	  char buf[strlen (result->pw_name)];
 	  enum nss_status status;
 
@@ -1516,13 +992,13 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
 	  if (status == NSS_STATUS_SUCCESS &&
 	      innetgr (buf, NULL, result->pw_name, NULL))
 	    return NSS_STATUS_NOTFOUND;
-          continue;
-        }
+	  continue;
+	}
 
       /* +user */
       if (result->pw_name[0] == '+' && result->pw_name[1] != '\0'
-          && result->pw_name[1] != '@')
-        {
+	  && result->pw_name[1] != '@')
+	{
 	  char buf[strlen (result->pw_name)];
 	  enum nss_status status;
 
@@ -1538,60 +1014,54 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
 	      if (strcmp (buf, result->pw_name) == 0)
 		return NSS_STATUS_SUCCESS;
 	    }
+	  else if (status == NSS_STATUS_RETURN)	/* We couldn't parse the entry */
+	    return NSS_STATUS_NOTFOUND;
 	  else
-            if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
-	      return NSS_STATUS_NOTFOUND;
-            else
-              return status;
+	    return status;
 
-          continue;
-        }
+	  continue;
+	}
 
       /* +:... */
       if (result->pw_name[0] == '+' && result->pw_name[1] == '\0')
-        {
-          enum nss_status status;
-
-          status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
-          if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
-            break;
-          else
-            if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
-	      return NSS_STATUS_NOTFOUND;
-            else
-              return status;
-        }
+	{
+	  enum nss_status status;
+
+	  status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
+	  if (status == NSS_STATUS_SUCCESS)	/* We found the entry. */
+	    break;
+	  else if (status == NSS_STATUS_RETURN)	/* We couldn't parse the entry */
+	    return NSS_STATUS_NOTFOUND;
+	  else
+	    return status;
+	}
     }
   return NSS_STATUS_SUCCESS;
 }
 
 enum nss_status
 _nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd,
-                        char *buffer, size_t buflen, int *errnop)
+			char *buffer, size_t buflen, int *errnop)
 {
-  ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
+  enum nss_status result;
+  ent_t ent = {0, 0, TRUE, NULL, {NULL, 0, 0},
                {NULL, NULL, 0, 0, NULL, NULL, NULL}};
-  enum nss_status status;
 
   __libc_lock_lock (lock);
 
   if (ni == NULL)
-    {
-      __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
 
   __libc_lock_unlock (lock);
 
-  status = internal_setpwent (&ent);
-  if (status != NSS_STATUS_SUCCESS)
-    return status;
+  result = internal_setpwent (&ent, 0);
 
-  status = internal_getpwuid_r (uid, pwd, &ent, buffer, buflen, errnop);
+  if (result == NSS_STATUS_SUCCESS)
+    result = internal_getpwuid_r (uid, pwd, &ent, buffer, buflen, errnop);
 
   internal_endpwent (&ent);
 
-  return status;
+  return result;
 }
 
 
@@ -1653,7 +1123,7 @@ in_blacklist (const char *name, int namelen, ent_t *ent)
 
   buf[0] = '|';
   cp = stpcpy (&buf[1], name);
-  *cp++= '|';
+  *cp++ = '|';
   *cp = '\0';
   return strstr (ent->blacklist.data, buf) != NULL;
 }
diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index 8ce02e3da3..a2757c4b66 100644
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2001,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
 
@@ -25,19 +25,20 @@
 #include <shadow.h>
 #include <string.h>
 #include <bits/libc-lock.h>
-#include <rpcsvc/yp.h>
+#include <rpc/types.h>
 #include <rpcsvc/ypclnt.h>
-#include <rpcsvc/nis.h>
 #include <nsswitch.h>
 
 #include "netgroup.h"
-#include "nss-nisplus.h"
-#include "nisplus-parser.h"
 
 static service_user *ni;
-static bool_t use_nisplus; /* default: passwd_compat: nis */
-static nis_name pwdtable; /* Name of the password table */
-static size_t pwdtablelen;
+static enum nss_status (*nss_setspent) (int stayopen);
+static enum nss_status (*nss_getspnam_r) (const char *name, struct spwd * sp,
+					  char *buffer, size_t buflen,
+					  int *errnop);
+static enum nss_status (*nss_getspent_r) (struct spwd * sp, char *buffer,
+					  size_t buflen, int *errnop);
+static enum nss_status (*nss_endspent) (void);
 
 /* Get the declaration of the parser function.  */
 #define ENTNAME spent
@@ -49,28 +50,25 @@ static size_t pwdtablelen;
 #define BLACKLIST_INITIAL_SIZE 512
 #define BLACKLIST_INCREMENT 256
 struct blacklist_t
-  {
-    char *data;
-    int current;
-    int size;
-  };
+{
+  char *data;
+  int current;
+  int size;
+};
 
 struct ent_t
-  {
-    bool_t netgroup;
-    bool_t nis;
-    bool_t first;
-    char *oldkey;
-    int oldkeylen;
-    nis_result *result;
-    FILE *stream;
-    struct blacklist_t blacklist;
-    struct spwd pwd;
-    struct __netgrent netgrdata;
-  };
+{
+  bool_t netgroup;
+  bool_t files;
+  bool_t first;
+  FILE *stream;
+  struct blacklist_t blacklist;
+  struct spwd pwd;
+  struct __netgrent netgrdata;
+};
 typedef struct ent_t ent_t;
 
-static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
+static ent_t ext_ent = {0, TRUE, 0, NULL, {NULL, 0, 0},
 			{NULL, NULL, 0, 0, 0, 0, 0, 0, 0}};
 
 /* Protect global state against multiple changers.  */
@@ -80,6 +78,21 @@ __libc_lock_define_initialized (static, lock)
 static void blacklist_store_name (const char *, ent_t *);
 static int in_blacklist (const char *, int, ent_t *);
 
+/* Initialize the NSS interface/functions. The calling function must
+   hold the lock.  */
+static void
+init_nss_interface (void)
+{
+  if (__nss_database_lookup ("shadow_compat", "passwd_compat",
+			     "nis", &ni) >= 0)
+    {
+      nss_setspent = __nss_lookup_function (ni, "setspent");
+      nss_getspnam_r = __nss_lookup_function (ni, "getspnam_r");
+      nss_getspent_r = __nss_lookup_function (ni, "getspent_r");
+      nss_endspent = __nss_lookup_function (ni, "endspent");
+    }
+}
+
 static void
 give_spwd_free (struct spwd *pwd)
 {
@@ -142,45 +155,17 @@ copy_spwd_changes (struct spwd *dest, struct spwd *src,
 }
 
 static enum nss_status
-internal_setspent (ent_t *ent)
+internal_setspent (ent_t *ent, int stayopen)
 {
   enum nss_status status = NSS_STATUS_SUCCESS;
 
-  ent->nis = ent->first = ent->netgroup = 0;
+  ent->first = ent->netgroup = 0;
+  ent->files = TRUE;
 
   /* If something was left over free it.  */
   if (ent->netgroup)
     __internal_endnetgrent (&ent->netgrdata);
 
-  if (ent->oldkey != NULL)
-    {
-      free (ent->oldkey);
-      ent->oldkey = NULL;
-      ent->oldkeylen = 0;
-    }
-
-  if (ent->result != NULL)
-    {
-      nis_freeresult (ent->result);
-      ent->result = NULL;
-    }
-
-  if (pwdtable == NULL)
-    {
-      static const char key[] = "passwd.org_dir.";
-      const char *local_dir = nis_local_directory ();
-      size_t len_local_dir = strlen (local_dir);
-
-      pwdtable = malloc (sizeof (key) + len_local_dir);
-      if (pwdtable == NULL)
-        return NSS_STATUS_TRYAGAIN;
-
-      pwdtablelen = ((char *) mempcpy (mempcpy (pwdtable,
-						key, sizeof (key) - 1),
-				       local_dir, len_local_dir + 1)
-		     - pwdtable) - 1;
-    }
-
   if (ent->blacklist.data != NULL)
     {
       ent->blacklist.current = 1;
@@ -210,7 +195,7 @@ internal_setspent (ent_t *ent)
 	  if (result < 0)
 	    {
 	      /* Something went wrong.  Close the stream and return a
-		 failure.  */
+	         failure.  */
 	      fclose (ent->stream);
 	      ent->stream = NULL;
 	      status = NSS_STATUS_UNAVAIL;
@@ -222,6 +207,9 @@ internal_setspent (ent_t *ent)
 
   give_spwd_free (&ent->pwd);
 
+  if (status == NSS_STATUS_SUCCESS && nss_setspent)
+    return nss_setspent (stayopen);
+
   return status;
 }
 
@@ -234,12 +222,9 @@ _nss_compat_setspent (int stayopen)
   __libc_lock_lock (lock);
 
   if (ni == NULL)
-    {
-      __nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
 
-  result = internal_setspent (&ext_ent);
+  result = internal_setspent (&ext_ent, stayopen);
 
   __libc_lock_unlock (lock);
 
@@ -250,6 +235,9 @@ _nss_compat_setspent (int stayopen)
 static enum nss_status
 internal_endspent (ent_t *ent)
 {
+  if (nss_endspent)
+    nss_endspent ();
+
   if (ent->stream != NULL)
     {
       fclose (ent->stream);
@@ -259,20 +247,8 @@ internal_endspent (ent_t *ent)
   if (ent->netgroup)
     __internal_endnetgrent (&ent->netgrdata);
 
-  ent->nis = ent->first = ent->netgroup = 0;
-
-  if (ent->oldkey != NULL)
-    {
-      free (ent->oldkey);
-      ent->oldkey = NULL;
-      ent->oldkeylen = 0;
-    }
-
-  if (ent->result != NULL)
-    {
-      nis_freeresult (ent->result);
-      ent->result = NULL;
-    }
+  ent->first = ent->netgroup = FALSE;
+  ent->files = TRUE;
 
   if (ent->blacklist.data != NULL)
     {
@@ -304,25 +280,27 @@ _nss_compat_endspent (void)
 
 
 static enum nss_status
-getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent,
-			 char *group, char *buffer, size_t buflen, int *errnop)
+getspent_next_nss_netgr (const char *name, struct spwd *result, ent_t *ent,
+			 char *group, char *buffer, size_t buflen,
+			 int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
-  char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
-  int status, outvallen;
+  char *curdomain, *host, *user, *domain, *p2;
   size_t p2len;
 
-  if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
+  if (!nss_getspnam_r)
+    return NSS_STATUS_UNAVAIL;
+
+  if (yp_get_default_domain (&curdomain) != YPERR_SUCCESS)
     {
-      ent->netgroup = 0;
-      ent->first = 0;
+      ent->netgroup = FALSE;
+      ent->first = FALSE;
       give_spwd_free (&ent->pwd);
       return NSS_STATUS_UNAVAIL;
     }
 
   if (ent->first == TRUE)
     {
-      bzero (&ent->netgrdata, sizeof (struct __netgrent));
+      memset (&ent->netgrdata, 0, sizeof (struct __netgrent));
       __internal_setnetgrent (group, &ent->netgrdata);
       ent->first = FALSE;
     }
@@ -330,7 +308,7 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent,
   while (1)
     {
       char *saved_cursor;
-      int parse_res;
+      enum nss_status status;
 
       saved_cursor = ent->netgrdata.cursor;
       status = __internal_getnetgrent_r (&host, &user, &domain,
@@ -339,7 +317,7 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent,
       if (status != 1)
 	{
 	  __internal_endnetgrent (&ent->netgrdata);
-	  ent->netgroup = 0;
+	  ent->netgroup = FALSE;
 	  give_spwd_free (&ent->pwd);
 	  return NSS_STATUS_RETURN;
 	}
@@ -347,7 +325,7 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent,
       if (user == NULL || user[0] == '-')
 	continue;
 
-      if (domain != NULL && strcmp (ypdomain, domain) != 0)
+      if (domain != NULL && strcmp (curdomain, domain) != 0)
 	continue;
 
       /* If name != NULL, we are called from getpwnam */
@@ -355,240 +333,43 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent,
 	if (strcmp (user, name) != 0)
 	  continue;
 
-      if (yp_match (ypdomain, "shadow.byname", user,
-		    strlen (user), &outval, &outvallen)
-	  != YPERR_SUCCESS)
-	continue;
-
       p2len = spwd_need_buflen (&ent->pwd);
       if (p2len > buflen)
 	{
-	  free (outval);
 	  *errnop = ERANGE;
 	  return NSS_STATUS_TRYAGAIN;
 	}
       p2 = buffer + (buflen - p2len);
       buflen -= p2len;
-      if (buflen < ((size_t) outval + 1))
-	{
-	  free (outval);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      p = strncpy (buffer, outval, buflen);
-      while (isspace (*p))
-	p++;
-      free (outval);
-      parse_res = _nss_files_parse_spent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	{
-	  ent->netgrdata.cursor = saved_cursor;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      if (parse_res)
-	{
-	  /* Store the User in the blacklist for the "+" at the end of
-	     /etc/passwd */
-	  blacklist_store_name (result->sp_namp, ent);
-	  copy_spwd_changes (result, &ent->pwd, p2, p2len);
-	  break;
-	}
-    }
-
-  return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getspent_next_nisplus_netgr (const char *name, struct spwd *result,
-			     ent_t *ent, char *group, char *buffer,
-			     size_t buflen, int *errnop)
-{
-  char *ypdomain, *host, *user, *domain, *p2;
-  int status, parse_res;
-  size_t p2len;
-  nis_result *nisres;
-
-  /* Maybe we should use domainname here ? We need the current
-     domainname for the domain field in netgroups */
-  if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
-    {
-      ent->netgroup = 0;
-      ent->first = 0;
-      give_spwd_free (&ent->pwd);
-      return NSS_STATUS_UNAVAIL;
-    }
-
-  if (ent->first == TRUE)
-    {
-      bzero (&ent->netgrdata, sizeof (struct __netgrent));
-      __internal_setnetgrent (group, &ent->netgrdata);
-      ent->first = FALSE;
-    }
-
-  while (1)
-    {
-      char *saved_cursor;
-
-      saved_cursor = ent->netgrdata.cursor;
-      status = __internal_getnetgrent_r (&host, &user, &domain,
-                                         &ent->netgrdata, buffer, buflen,
-					 errnop);
-      if (status != 1)
-        {
-          __internal_endnetgrent (&ent->netgrdata);
-          ent->netgroup = 0;
-          give_spwd_free (&ent->pwd);
-          return NSS_STATUS_RETURN;
-        }
 
-      if (user == NULL || user[0] == '-')
-        continue;
-
-      if (domain != NULL && strcmp (ypdomain, domain) != 0)
-        continue;
-
-      /* If name != NULL, we are called from getpwnam */
-      if (name != NULL)
-	if (strcmp (user, name) != 0)
-	  continue;
+      if (nss_getspnam_r (user, result, buffer, buflen, errnop) !=
+	  NSS_STATUS_SUCCESS)
+	continue;
 
-      p2len = spwd_need_buflen (&ent->pwd);
-      if (p2len > buflen)
-        {
-          *errnop = ERANGE;
-          return NSS_STATUS_TRYAGAIN;
-        }
-      p2 = buffer + (buflen - p2len);
-      buflen -= p2len;
-      {
-        char buf[strlen (user) + 30 + pwdtablelen];
-        sprintf (buf, "[name=%s],%s", user, pwdtable);
-        nisres = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
-      }
-      if (niserr2nss (nisres->status) != NSS_STATUS_SUCCESS)
-        {
-          nis_freeresult (nisres);
-          continue;
-        }
-      parse_res = _nss_nisplus_parse_spent (nisres, result, buffer,
-					    buflen, errnop);
-      if (parse_res == -1)
+      if (!in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
 	{
-	  nis_freeresult (nisres);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      nis_freeresult (nisres);
-
-      if (parse_res)
-        {
-	  /* Store the User in the blacklist for the "+" at the end of
-	     /etc/passwd */
+	  /* Store the User in the blacklist for possible the "+" at the
+	     end of /etc/passwd */
 	  blacklist_store_name (result->sp_namp, ent);
 	  copy_spwd_changes (result, &ent->pwd, p2, p2len);
-          break;
-        }
-    }
-
-  return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
-                       size_t buflen, int *errnop)
-{
-  int parse_res;
-  size_t p2len;
-  char *p2;
-
-  p2len = spwd_need_buflen (&ent->pwd);
-  if (p2len > buflen)
-    {
-      *errnop = ERANGE;
-      return NSS_STATUS_TRYAGAIN;
-    }
-  p2 = buffer + (buflen - p2len);
-  buflen -= p2len;
-  do
-    {
-      bool_t saved_first;
-      nis_result *saved_res;
-
-      if (ent->first)
-        {
-	  saved_first = TRUE;
-	  saved_res = ent->result;
-
-          ent->result = nis_first_entry (pwdtable);
-          if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
-            {
-              ent->nis = 0;
-              give_spwd_free (&ent->pwd);
-              return niserr2nss (ent->result->status);
-            }
-          ent->first = FALSE;
-        }
-      else
-        {
-          nis_result *res;
-
-	  saved_first = FALSE;
-	  saved_res = ent->result;
-
-          res = nis_next_entry (pwdtable, &ent->result->cookie);
-          ent->result = res;
-          if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
-            {
-	      nis_freeresult (saved_res);
-	      ent->nis = 0;
-	      give_spwd_free (&ent->pwd);
-	      return niserr2nss (ent->result->status);
-            }
-        }
-      parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer,
-					    buflen, errnop);
-      if (parse_res == -1)
-	{
-	  ent->first = saved_first;
-	  nis_freeresult (ent->result);
-	  ent->result = saved_res;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  if (!saved_first)
-	    nis_freeresult (saved_res);
+	  break;
 	}
-      if (parse_res &&
-          in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
-        parse_res = 0; /* if result->pw_name in blacklist,search next entry */
     }
-  while (!parse_res);
-
-  copy_spwd_changes (result, &ent->pwd, p2, p2len);
 
   return NSS_STATUS_SUCCESS;
 }
 
 
 static enum nss_status
-getspent_next_nis (struct spwd *result, ent_t *ent,
+getspent_next_nss (struct spwd *result, ent_t *ent,
 		   char *buffer, size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
-  char *domain, *outkey, *outval, *p, *p2;
-  int outkeylen, outvallen, parse_res;
+  enum nss_status status;
+  char *p2;
   size_t p2len;
 
-  if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-    {
-      ent->nis = 0;
-      give_spwd_free (&ent->pwd);
-      return NSS_STATUS_UNAVAIL;
-    }
+  if (!nss_getspent_r)
+    return NSS_STATUS_UNAVAIL;
 
   p2len = spwd_need_buflen (&ent->pwd);
   if (p2len > buflen)
@@ -600,87 +381,11 @@ getspent_next_nis (struct spwd *result, ent_t *ent,
   buflen -= p2len;
   do
     {
-      bool_t saved_first;
-      char *saved_oldkey;
-      int saved_oldlen;
-
-      if (ent->first)
-	{
-	  if (yp_first (domain, "shadow.byname", &outkey, &outkeylen,
-			&outval, &outvallen) != YPERR_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      give_spwd_free (&ent->pwd);
-	      return NSS_STATUS_UNAVAIL;
-	    }
-
-	  if (buflen < ((size_t) outvallen + 1))
-	    {
-	      free (outval);
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  saved_first = TRUE;
-	  saved_oldkey = ent->oldkey;
-	  saved_oldlen = ent->oldkeylen;
-	  ent->oldkey = outkey;
-	  ent->oldkeylen = outkeylen;
-	  ent->first = FALSE;
-	}
-      else
-	{
-	  if (yp_next (domain, "shadow.byname", ent->oldkey, ent->oldkeylen,
-		       &outkey, &outkeylen, &outval, &outvallen)
-	      != YPERR_SUCCESS)
-	    {
-	      ent->nis = 0;
-	      give_spwd_free (&ent->pwd);
-	      return NSS_STATUS_NOTFOUND;
-	    }
-
-	  if (buflen < ((size_t) outvallen + 1))
-	    {
-	      free (outval);
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-
-	  saved_first = FALSE;
-	  saved_oldkey = ent->oldkey;
-	  saved_oldlen = ent->oldkeylen;
-	  ent->oldkey = outkey;
-	  ent->oldkeylen = outkeylen;
-	}
-
-      /* Copy the found data to our buffer  */
-      p = strncpy (buffer, outval, buflen);
-
-      /* ...and free the data.  */
-      free (outval);
-
-      while (isspace (*p))
-	++p;
-      parse_res = _nss_files_parse_spent (p, result, data, buflen, errnop);
-      if (parse_res == -1)
-	{
-	  free (ent->oldkey);
-	  ent->oldkey = saved_oldkey;
-	  ent->oldkeylen = saved_oldlen;
-	  ent->first = saved_first;
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  if (!saved_first)
-	    free (saved_oldkey);
-	}
-      if (parse_res &&
-          in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
-        parse_res = 0;
+      if ((status = nss_getspent_r (result, buffer, buflen, errnop)) !=
+	  NSS_STATUS_SUCCESS)
+	return status;
     }
-  while (!parse_res);
+  while (in_blacklist (result->sp_namp, strlen (result->sp_namp), ent));
 
   copy_spwd_changes (result, &ent->pwd, p2, p2len);
 
@@ -689,15 +394,16 @@ getspent_next_nis (struct spwd *result, ent_t *ent,
 
 /* This function handle the +user entrys in /etc/shadow */
 static enum nss_status
-getspnam_plususer (const char *name, struct spwd *result, char *buffer,
-		   size_t buflen, int *errnop)
+getspnam_plususer (const char *name, struct spwd *result, ent_t *ent,
+		   char *buffer, size_t buflen, int *errnop)
 {
-  struct parser_data *data = (void *) buffer;
   struct spwd pwd;
-  int parse_res;
   char *p;
   size_t plen;
 
+  if (!nss_getspnam_r)
+    return NSS_STATUS_UNAVAIL;
+
   memset (&pwd, '\0', sizeof (struct spwd));
   pwd.sp_warn = -1;
   pwd.sp_inact = -1;
@@ -715,71 +421,16 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer,
   p = buffer + (buflen - plen);
   buflen -= plen;
 
-  if (use_nisplus) /* Do the NIS+ query here */
-    {
-      nis_result *res;
-      char buf[strlen (name) + 24 + pwdtablelen];
-
-      sprintf(buf, "[name=%s],%s", name, pwdtable);
-      res = nis_list(buf, 0, NULL, NULL);
-      if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
-        {
-          enum nss_status status =  niserr2nss (res->status);
-
-          nis_freeresult (res);
-          return status;
-        }
-      parse_res = _nss_nisplus_parse_spent (res, result, buffer,
-					    buflen, errnop);
-      if (parse_res == -1)
-	{
-	  nis_freeresult (res);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      nis_freeresult (res);
-    }
-  else /* Use NIS */
-    {
-      char *domain, *outval, *ptr;
-      int outvallen;
-
-      if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (yp_match (domain, "shadow.byname", name, strlen (name),
-		    &outval, &outvallen)  != YPERR_SUCCESS)
-	return NSS_STATUS_NOTFOUND;
-
-      if (buflen < ((size_t) outvallen + 1))
-	{
-	  free (outval);
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
+  if (nss_getspnam_r (name, result, buffer, buflen, errnop) !=
+      NSS_STATUS_SUCCESS)
+    return NSS_STATUS_NOTFOUND;
 
-      ptr = strncpy (buffer, outval, buflen);
-      free (outval);
-      while (isspace (*ptr))
-        ptr++;
-      parse_res = _nss_files_parse_spent (ptr, result, data, buflen, errnop);
-      if (parse_res == -1)
-	return NSS_STATUS_TRYAGAIN;
-    }
+  if (in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
+    return NSS_STATUS_NOTFOUND;
 
-  if (parse_res)
-    {
-      copy_spwd_changes (result, &pwd, p, plen);
-      give_spwd_free (&pwd);
-      /* We found the entry.  */
-      return NSS_STATUS_SUCCESS;
-    }
-  else
-    {
-      /* Give buffer the old len back */
-      buflen += plen;
-      give_spwd_free (&pwd);
-    }
+  copy_spwd_changes (result, &pwd, p, plen);
+  give_spwd_free (&pwd);
+  /* We found the entry.  */
   return NSS_STATUS_RETURN;
 }
 
@@ -814,18 +465,18 @@ getspent_next_file (struct spwd *result, ent_t *ent,
 	    ++p;
 	}
       while (*p == '\0' || *p == '#'	/* Ignore empty and comment lines.  */
-      /* Parse the line.  If it is invalid, loop to
-         get the next line of the file to parse.  */
+	     /* Parse the line.  If it is invalid, loop to
+	        get the next line of the file to parse.  */
 	     || !(parse_res = _nss_files_parse_spent (p, result, data,
 						      buflen, errnop)));
 
       if (parse_res == -1)
-        {
-          /* The parser ran out of space.  */
-          fsetpos (ent->stream, &pos);
-          *errnop = ERANGE;
-          return NSS_STATUS_TRYAGAIN;
-        }
+	{
+	  /* The parser ran out of space.  */
+	  fsetpos (ent->stream, &pos);
+	  *errnop = ERANGE;
+	  return NSS_STATUS_TRYAGAIN;
+	}
 
       if (result->sp_namp[0] != '+' && result->sp_namp[0] != '-')
 	/* This is a real entry.  */
@@ -836,12 +487,12 @@ getspent_next_file (struct spwd *result, ent_t *ent,
 	  && result->sp_namp[2] != '\0')
 	{
 	  /* XXX Do not use fixed length buffers.  */
-          char buf2[1024];
+	  char buf2[1024];
 	  char *user, *host, *domain;
-          struct __netgrent netgrdata;
+	  struct __netgrent netgrdata;
 
-          bzero (&netgrdata, sizeof (struct __netgrent));
-          __internal_setnetgrent (&result->sp_namp[2], &netgrdata);
+	  bzero (&netgrdata, sizeof (struct __netgrent));
+	  __internal_setnetgrent (&result->sp_namp[2], &netgrdata);
 	  while (__internal_getnetgrent_r (&host, &user, &domain,
 					   &netgrdata, buf2, sizeof (buf2),
 					   errnop))
@@ -863,14 +514,9 @@ getspent_next_file (struct spwd *result, ent_t *ent,
 	  ent->first = TRUE;
 	  copy_spwd_changes (&ent->pwd, result, NULL, 0);
 
-	  if (use_nisplus)
-	    status = getspent_next_nisplus_netgr (NULL, result, ent,
-						  &result->sp_namp[2],
-						  buffer, buflen, errnop);
-	  else
-	    status = getspent_next_nis_netgr (NULL, result, ent,
-					      &result->sp_namp[2],
-					      buffer, buflen, errnop);
+	  status = getspent_next_nss_netgr (NULL, result, ent,
+					    &result->sp_namp[2],
+					    buffer, buflen, errnop);
 	  if (status == NSS_STATUS_RETURN)
 	    continue;
 	  else
@@ -889,41 +535,38 @@ getspent_next_file (struct spwd *result, ent_t *ent,
       if (result->sp_namp[0] == '+' && result->sp_namp[1] != '\0'
 	  && result->sp_namp[1] != '@')
 	{
-          enum nss_status status;
+	  enum nss_status status;
 
 	  /* Store the User in the blacklist for the "+" at the end of
 	     /etc/passwd */
 	  blacklist_store_name (&result->sp_namp[1], ent);
-          status = getspnam_plususer (&result->sp_namp[1], result, buffer,
-				      buflen, errnop);
-          if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
-            break;
-          else
-            if (status == NSS_STATUS_RETURN /* We couldn't parse the entry */
-		|| status == NSS_STATUS_NOTFOUND) /* entry doesn't exist */
-              continue;
-            else
-	      {
-		if (status == NSS_STATUS_TRYAGAIN)
-		  {
-		    fsetpos (ent->stream, &pos);
-		    *errnop = ERANGE;
-		  }
-		return status;
-	      }
+	  status = getspnam_plususer (&result->sp_namp[1], result, ent,
+				      buffer, buflen, errnop);
+
+	  if (status == NSS_STATUS_SUCCESS)	/* We found the entry. */
+	    break;
+	  else if (status == NSS_STATUS_RETURN	/* We couldn't parse the entry */
+		   || status == NSS_STATUS_NOTFOUND)	/* entry doesn't exist */
+	    continue;
+	  else
+	    {
+	      if (status == NSS_STATUS_TRYAGAIN)
+		{
+		  fsetpos (ent->stream, &pos);
+		  *errnop = ERANGE;
+		}
+	      return status;
+	    }
 	}
 
       /* +:... */
       if (result->sp_namp[0] == '+' && result->sp_namp[1] == '\0')
 	{
-	  ent->nis = TRUE;
+	  ent->files = FALSE;
 	  ent->first = TRUE;
 	  copy_spwd_changes (&ent->pwd, result, NULL, 0);
 
-	  if (use_nisplus)
-	    return getspent_next_nisplus (result, ent, buffer, buflen, errnop);
-	  else
-	    return getspent_next_nis (result, ent, buffer, buflen, errnop);
+	  return getspent_next_nss (result, ent, buffer, buflen, errnop);
 	}
     }
 
@@ -937,57 +580,45 @@ internal_getspent_r (struct spwd *pw, ent_t *ent,
 {
   if (ent->netgroup)
     {
-      int status;
+      enum nss_status status;
 
       /* We are searching members in a netgroup */
       /* Since this is not the first call, we don't need the group name */
-      if (use_nisplus)
-	status = getspent_next_nisplus_netgr (NULL, pw, ent, NULL, buffer,
-					      buflen, errnop);
-      else
-	status = getspent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen,
-					  errnop);
+      status = getspent_next_nss_netgr (NULL, pw, ent, NULL, buffer,
+					buflen, errnop);
+
       if (status == NSS_STATUS_RETURN)
 	return getspent_next_file (pw, ent, buffer, buflen, errnop);
       else
 	return status;
     }
+  else if (ent->files)
+    return getspent_next_file (pw, ent, buffer, buflen, errnop);
   else
-    if (ent->nis)
-      {
-	if (use_nisplus)
-	  return getspent_next_nisplus (pw, ent, buffer, buflen, errnop);
-	else
-	  return getspent_next_nis (pw, ent, buffer, buflen, errnop);
-      }
-    else
-      return getspent_next_file (pw, ent, buffer, buflen, errnop);
+    return getspent_next_nss (pw, ent, buffer, buflen, errnop);
 }
 
 enum nss_status
 _nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen,
 			int *errnop)
 {
-  enum nss_status status = NSS_STATUS_SUCCESS;
+  enum nss_status result = NSS_STATUS_SUCCESS;
 
   __libc_lock_lock (lock);
 
+  /* Be prepared that the setpwent function was not called before.  */
   if (ni == NULL)
-    {
-      __nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
 
-  /* Be prepared that the setspent function was not called before.  */
   if (ext_ent.stream == NULL)
-    status = internal_setspent (&ext_ent);
+    result = internal_setspent (&ext_ent, 1);
 
-  if (status == NSS_STATUS_SUCCESS)
-    status = internal_getspent_r (pwd, &ext_ent, buffer, buflen, errnop);
+  if (result == NSS_STATUS_SUCCESS)
+    result = internal_getspent_r (pwd, &ext_ent, buffer, buflen, errnop);
 
   __libc_lock_unlock (lock);
 
-  return status;
+  return result;
 }
 
 /* Searches in /etc/passwd and the NIS/NIS+ map for a special user */
@@ -1022,9 +653,9 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
 	  while (isspace (*p))
 	    ++p;
 	}
-      while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines.  */
+      while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */
 	     /* Parse the line.  If it is invalid, loop to
-		get the next line of the file to parse.  */
+	        get the next line of the file to parse.  */
 	     !(parse_res = _nss_files_parse_spent (p, result, data, buflen,
 						   errnop)));
 
@@ -1046,6 +677,8 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
 	}
 
       /* -@netgroup */
+      /* If the loaded NSS module does not support this service, add
+         all users from a +@netgroup entry to the blacklist, too.  */
       if (result->sp_namp[0] == '-' && result->sp_namp[1] == '@'
 	  && result->sp_namp[2] != '\0')
 	{
@@ -1080,19 +713,16 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
 
 	  do
 	    {
-	      if (use_nisplus)
-		status = getspent_next_nisplus_netgr (name, result, ent, buf,
-						      buffer, buflen, errnop);
-	      else
-		status = getspent_next_nis_netgr (name, result, ent, buf,
-						  buffer, buflen, errnop);
+	      status = getspent_next_nss_netgr (name, result, ent, buf,
+						buffer, buflen, errnop);
 	      if (status == NSS_STATUS_RETURN)
 		continue;
 
 	      if (status == NSS_STATUS_SUCCESS
 		  && strcmp (result->sp_namp, name) == 0)
 		return NSS_STATUS_SUCCESS;
-	    } while (status == NSS_STATUS_SUCCESS);
+	    }
+	  while (status == NSS_STATUS_SUCCESS);
 	  continue;
 	}
 
@@ -1114,8 +744,9 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
 	    {
 	      enum nss_status status;
 
-	      status = getspnam_plususer (name, result, buffer, buflen,
-					  errnop);
+	      status = getspnam_plususer (name, result, ent,
+					  buffer, buflen, errnop);
+
 	      if (status == NSS_STATUS_RETURN)
 		/* We couldn't parse the entry */
 		return NSS_STATUS_NOTFOUND;
@@ -1129,8 +760,10 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
 	{
 	  enum nss_status status;
 
-	  status = getspnam_plususer (name, result, buffer, buflen, errnop);
-	  if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
+	  status = getspnam_plususer (name, result, ent,
+				      buffer, buflen, errnop);
+
+	  if (status == NSS_STATUS_RETURN)	/* We couldn't parse the entry */
 	    return NSS_STATUS_NOTFOUND;
 	  else
 	    return status;
@@ -1143,28 +776,30 @@ enum nss_status
 _nss_compat_getspnam_r (const char *name, struct spwd *pwd,
 			char *buffer, size_t buflen, int *errnop)
 {
-  ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
+  enum nss_status result;
+  ent_t ent = {0, TRUE, 0, NULL, {NULL, 0, 0},
 	       {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}};
-  enum nss_status status;
 
   if (name[0] == '-' || name[0] == '+')
     return NSS_STATUS_NOTFOUND;
 
+  __libc_lock_lock (lock);
+
   if (ni == NULL)
-    {
-      __nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
-      use_nisplus = (strcmp (ni->name, "nisplus") == 0);
-    }
+    init_nss_interface ();
+
+  __libc_lock_unlock (lock);
 
-  status = internal_setspent (&ent);
-  if (status != NSS_STATUS_SUCCESS)
-    return status;
+  result = internal_setspent (&ent, 0);
 
-  status = internal_getspnam_r (name, pwd, &ent, buffer, buflen, errnop);
+  if (result != NSS_STATUS_SUCCESS)
+    return result;
+
+  result = internal_getspnam_r (name, pwd, &ent, buffer, buflen, errnop);
 
   internal_endspent (&ent);
 
-  return status;
+  return result;
 }
 
 /* Support routines for remembering -@netgroup and -user entries.
@@ -1225,7 +860,7 @@ in_blacklist (const char *name, int namelen, ent_t *ent)
 
   buf[0] = '|';
   cp = stpcpy (&buf[1], name);
-  *cp++= '|';
+  *cp++ = '|';
   *cp = '\0';
   return strstr (ent->blacklist.data, buf) != NULL;
 }
diff --git a/nss/Versions b/nss/Versions
index 91a96a38d1..463ffb5874 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -9,7 +9,7 @@ libc {
   }
   GLIBC_PRIVATE {
     _nss_files_parse_grent; _nss_files_parse_pwent; _nss_files_parse_spent;
-    __nss_disable_nscd;
+    __nss_disable_nscd; __nss_lookup_function;
   }
 }
 
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 188479dd49..408352590a 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -141,6 +141,11 @@
 # define __ASSUME_IPC64		1
 #endif
 
+/* We can use the LDTs for threading with Linux 2.3.99 and newer.  */
+#if __LINUX_KERNEL_VERSION >= 131939
+# define __ASSUME_LDT_WORKS		1
+#endif
+
 /* Linux 2.4.0 on PPC introduced a correct IPC64. But PowerPC64 does not
    support a separate 64-bit sys call, already 64-bit */
 #if __LINUX_KERNEL_VERSION >= 132096 && defined __powerpc__ \
@@ -148,15 +153,18 @@
 # define __ASSUME_IPC64			1
 #endif
 
-/* We can use the LDTs for threading with Linux 2.3.99 and newer.  */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_LDT_WORKS		1
+/* SH kernels got stat64, mmap2, and truncate64 during 2.4.0-test.  */
+#if __LINUX_KERNEL_VERSION >= 132096 && defined __sh__
+# define __ASSUME_TRUNCATE64_SYSCALL	1
+# define __ASSUME_MMAP2_SYSCALL		1
+# define __ASSUME_STAT64_SYSCALL	1
 #endif
 
 /* The changed st_ino field appeared in 2.4.0-test6.  But we cannot
    distinguish this version from other 2.4.0 releases.  Therefore play
-   save and assume it available is for 2.4.1 and up.  */
-#if __LINUX_KERNEL_VERSION >= 132097 && !defined __alpha__
+   save and assume it available is for 2.4.1 and up.  However, SH is lame,
+   and still does not have a 64-bit inode field.  */
+#if __LINUX_KERNEL_VERSION >= 132097 && !defined __alpha__ && !defined __sh__
 # define __ASSUME_ST_INO_64_BIT		1
 #endif