(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

1 files changed, 133 insertions, 255 deletions

diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c
index cd33aebbcc..8f3bc997b3 100644
--- a/nis/nss_nisplus/nisplus-pwd.c
+++ b/nis/nss_nisplus/nisplus-pwd.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1997, 1999, 2001, 2002, 2003, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997, 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>, 1997.
 
@@ -18,7 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <atomic.h>
 #include <nss.h>
 #include <errno.h>
 #include <pwd.h>
@@ -28,246 +26,126 @@
 
 #include "nss-nisplus.h"
 #include "nisplus-parser.h"
-#include <libnsl.h>
-#include <nis_intern.h>
-#include <nis_xdr.h>
-
 
 __libc_lock_define_initialized (static, lock)
 
-/* Connection information.  */
-static ib_request *ibreq;
-static directory_obj *dir;
-static dir_binding bptr;
-static char *tablepath;
-static char *tableptr;
-/* Cursor.  */
-static netobj cursor;
-
+static nis_result *result;
+static nis_name tablename_val;
+static u_long tablename_len;
 
-nis_name pwd_tablename_val attribute_hidden;
-size_t pwd_tablename_len attribute_hidden;
-
-enum nss_status
-_nss_pwd_create_tablename (int *errnop)
+static enum nss_status
+_nss_create_tablename (int *errnop)
 {
-  if (pwd_tablename_val == NULL)
+  if (tablename_val == NULL)
     {
-      const char *local_dir = nis_local_directory ();
-      size_t local_dir_len = strlen (local_dir);
-      static const char prefix[] = "passwd.org_dir.";
+      char buf [40 + strlen (nis_local_directory ())];
+      char *p;
 
-      char *p = malloc (sizeof (prefix) + local_dir_len);
-      if (p == NULL)
+      p = __stpcpy (buf, "passwd.org_dir.");
+      p = __stpcpy (p, nis_local_directory ());
+      tablename_val = __strdup (buf);
+      if (tablename_val == NULL)
 	{
 	  *errnop = errno;
 	  return NSS_STATUS_TRYAGAIN;
 	}
-
-      memcpy (__stpcpy (p, prefix), local_dir, local_dir_len + 1);
-
-      pwd_tablename_len = sizeof (prefix) - 1 + local_dir_len;
-
-      atomic_write_barrier ();
-
-      if (atomic_compare_and_exchange_bool_acq (&pwd_tablename_val, p, NULL))
-	{
-	  /* Another thread already installed the value.  */
-	  free (p);
-	  pwd_tablename_len = strlen (pwd_tablename_val);
-	}
+      tablename_len = strlen (tablename_val);
     }
-
   return NSS_STATUS_SUCCESS;
 }
 
 
-static void
-internal_nisplus_endpwent (void)
-{
-  __nisbind_destroy (&bptr);
-  memset (&bptr, '\0', sizeof (bptr));
-
-  nis_free_directory (dir);
-  dir = NULL;
-
-  nis_free_request (ibreq);
-  ibreq = NULL;
-
-  xdr_free ((xdrproc_t) xdr_netobj, (char *) &cursor);
-  memset (&cursor, '\0', sizeof (cursor));
-
-  free (tablepath);
-  tableptr = tablepath = NULL;
-}
-
-
-static enum nss_status
-internal_nisplus_setpwent (int *errnop)
-{
-  enum nss_status status = NSS_STATUS_SUCCESS;
-
-  if (pwd_tablename_val == NULL)
-    status = _nss_pwd_create_tablename (errnop);
-
-  if (status == NSS_STATUS_SUCCESS)
-    {
-      ibreq = __create_ib_request (pwd_tablename_val, 0);
-      if (ibreq == NULL)
-	{
-	  *errnop = errno;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-
-      nis_error retcode = __prepare_niscall (pwd_tablename_val, &dir,
-					     &bptr, 0);
-      if (retcode != NIS_SUCCESS)
-	{
-	  nis_free_request (ibreq);
-	  ibreq = NULL;
-	  status = niserr2nss (retcode);
-	}
-    }
-
-  return status;
-}
-
-
 enum nss_status
 _nss_nisplus_setpwent (int stayopen)
 {
-  enum nss_status status;
+  enum nss_status status = NSS_STATUS_SUCCESS;
+  int err;
 
   __libc_lock_lock (lock);
 
-  internal_nisplus_endpwent ();
+  if (result)
+    nis_freeresult (result);
+  result = NULL;
 
-  // XXX We need to be able to set errno.  Pass in new parameter.
-  int err;
-  status = internal_nisplus_setpwent (&err);
+  if (tablename_val == NULL)
+    status = _nss_create_tablename (&err);
 
   __libc_lock_unlock (lock);
 
   return status;
 }
 
-
 enum nss_status
 _nss_nisplus_endpwent (void)
 {
   __libc_lock_lock (lock);
 
-  internal_nisplus_endpwent ();
+  if (result)
+    nis_freeresult (result);
+  result = NULL;
 
   __libc_lock_unlock (lock);
 
   return NSS_STATUS_SUCCESS;
 }
 
-
 static enum nss_status
 internal_nisplus_getpwent_r (struct passwd *pw, char *buffer, size_t buflen,
 			     int *errnop)
 {
-  int parse_res = -1;
-  enum nss_status retval = NSS_STATUS_SUCCESS;
+  int parse_res;
 
   /* Get the next entry until we found a correct one. */
   do
     {
-      nis_error status;
-      nis_result result;
-      memset (&result, '\0', sizeof (result));
+      nis_result *saved_res;
 
-      if (cursor.n_bytes == NULL)
+      if (result == NULL)
 	{
-	  if (ibreq == NULL)
+	  saved_res = NULL;
+          if (tablename_val == NULL)
 	    {
-	      retval = internal_nisplus_setpwent (errnop);
-	      if (retval != NSS_STATUS_SUCCESS)
-		return retval;
+	      enum nss_status status = _nss_create_tablename (errnop);
+
+	      if (status != NSS_STATUS_SUCCESS)
+		return status;
 	    }
 
-	  status = __do_niscall3 (&bptr, NIS_IBFIRST,
-				  (xdrproc_t) _xdr_ib_request,
-				  (caddr_t) ibreq,
-				  (xdrproc_t) _xdr_nis_result,
-				  (caddr_t) &result,
-				  0, NULL);
+	  result = nis_first_entry (tablename_val);
+	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+	    return niserr2nss (result->status);
 	}
       else
 	{
-	  ibreq->ibr_cookie.n_bytes = cursor.n_bytes;
-	  ibreq->ibr_cookie.n_len = cursor.n_len;
-
-	  status = __do_niscall3 (&bptr, NIS_IBNEXT,
-				  (xdrproc_t) _xdr_ib_request,
-				  (caddr_t) ibreq,
-				  (xdrproc_t) _xdr_nis_result,
-				  (caddr_t) &result,
-				  0, NULL);
-
-	  ibreq->ibr_cookie.n_bytes = NULL;
-	  ibreq->ibr_cookie.n_len = 0;
-	}
-
-      if (status != NIS_SUCCESS)
-	return niserr2nss (status);
+	  nis_result *res;
 
-      if (NIS_RES_STATUS (&result) == NIS_NOTFOUND)
-	{
-	  /* No more entries on this server.  This means we have to go
-	     to the next server on the path.  */
-	  status = __follow_path (&tablepath, &tableptr, ibreq, &bptr);
-	  if (status != NIS_SUCCESS)
-	    return niserr2nss (status);
-
-	  directory_obj *newdir = NULL;
-	  dir_binding newbptr;
-	  status = __prepare_niscall (ibreq->ibr_name, &newdir, &newbptr, 0);
-	  if (status != NIS_SUCCESS)
-	    return niserr2nss (status);
-
-	  nis_free_directory (dir);
-	  dir = newdir;
-	  __nisbind_destroy (&bptr);
-	  bptr = newbptr;
-
-	  xdr_free ((xdrproc_t) xdr_netobj, (char *) &result.cookie);
-	  result.cookie.n_bytes = NULL;
-	  result.cookie.n_len = 0;
-	  parse_res = 0;
-	  goto next;
+	  saved_res = result;
+	  res = nis_next_entry (tablename_val, &result->cookie);
+	  result = res;
+	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+	    {
+	      nis_freeresult (saved_res);
+	      return niserr2nss (result->status);
+	    }
 	}
-      else if (NIS_RES_STATUS (&result) != NIS_SUCCESS)
-	return niserr2nss (NIS_RES_STATUS (&result));
 
-      parse_res = _nss_nisplus_parse_pwent (&result, pw, buffer,
+      parse_res = _nss_nisplus_parse_pwent (result, pw, buffer,
 					    buflen, errnop);
-
-      if (__builtin_expect (parse_res == -1, 0))
+      if (parse_res == -1)
 	{
+	  nis_freeresult (result);
+	  result = saved_res;
 	  *errnop = ERANGE;
-	  retval = NSS_STATUS_TRYAGAIN;
-	  goto freeres;
+	  return NSS_STATUS_TRYAGAIN;
 	}
+      else
+	{
+	  if (saved_res)
+	    nis_freeresult (saved_res);
+	}
+    } while (!parse_res);
 
-    next:
-      /* Free the old cursor.  */
-      xdr_free ((xdrproc_t) xdr_netobj, (char *) &cursor);
-      /* Remember the new one.  */
-      cursor.n_bytes = result.cookie.n_bytes;
-      cursor.n_len = result.cookie.n_len;
-      /* Free the result structure.  NB: we do not remove the cookie.  */
-      result.cookie.n_bytes = NULL;
-      result.cookie.n_len = 0;
-    freeres:
-      xdr_free ((xdrproc_t) _xdr_nis_result, (char *) &result);
-      memset (&result, '\0', sizeof (result));
-    }
-  while (!parse_res);
-
-  return retval;
+  return NSS_STATUS_SUCCESS;
 }
 
 enum nss_status
@@ -291,9 +169,9 @@ _nss_nisplus_getpwnam_r (const char *name, struct passwd *pw,
 {
   int parse_res;
 
-  if (pwd_tablename_val == NULL)
+  if (tablename_val == NULL)
     {
-      enum nss_status status = _nss_pwd_create_tablename (errnop);
+      enum nss_status status = _nss_create_tablename (errnop);
 
       if (status != NSS_STATUS_SUCCESS)
 	return status;
@@ -304,107 +182,107 @@ _nss_nisplus_getpwnam_r (const char *name, struct passwd *pw,
       *errnop = EINVAL;
       return NSS_STATUS_UNAVAIL;
     }
+  else
+    {
+      nis_result *result;
+      char buf[strlen (name) + 24 + tablename_len];
+      int olderr = errno;
 
-  nis_result *result;
-  char buf[strlen (name) + 9 + pwd_tablename_len];
-  int olderr = errno;
+      sprintf (buf, "[name=%s],%s", name, tablename_val);
 
-  snprintf (buf, sizeof (buf), "[name=%s],%s", name, pwd_tablename_val);
+      result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 
-  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM, NULL, NULL);
+      if (result == NULL)
+	{
+	  *errnop = ENOMEM;
+	  return NSS_STATUS_TRYAGAIN;
+	}
+      if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+	{
+	  enum nss_status status =  niserr2nss (result->status);
 
-  if (result == NULL)
-    {
-      *errnop = ENOMEM;
-      return NSS_STATUS_TRYAGAIN;
-    }
+	  __set_errno (olderr);
 
-  if (__builtin_expect (niserr2nss (result->status) != NSS_STATUS_SUCCESS, 0))
-    {
-      enum nss_status status =  niserr2nss (result->status);
+	  nis_freeresult (result);
+	  return status;
+	}
 
-      __set_errno (olderr);
+      parse_res = _nss_nisplus_parse_pwent (result, pw, buffer, buflen,
+					    errnop);
 
       nis_freeresult (result);
-      return status;
-    }
-
-  parse_res = _nss_nisplus_parse_pwent (result, pw, buffer, buflen, errnop);
 
-  nis_freeresult (result);
-
-  if (__builtin_expect (parse_res < 1, 0))
-    {
-      if (parse_res == -1)
-	{
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
+      if (parse_res < 1)
 	{
-	  __set_errno (olderr);
-	  return NSS_STATUS_NOTFOUND;
+	  if (parse_res == -1)
+	    {
+	      *errnop = ERANGE;
+	      return NSS_STATUS_TRYAGAIN;
+	    }
+	  else
+	    {
+	      __set_errno (olderr);
+	      return NSS_STATUS_NOTFOUND;
+	    }
 	}
+      return NSS_STATUS_SUCCESS;
     }
-
-  return NSS_STATUS_SUCCESS;
 }
 
 enum nss_status
 _nss_nisplus_getpwuid_r (const uid_t uid, struct passwd *pw,
 			 char *buffer, size_t buflen, int *errnop)
 {
-  if (pwd_tablename_val == NULL)
+  if (tablename_val == NULL)
     {
-      enum nss_status status = _nss_pwd_create_tablename (errnop);
+      enum nss_status status = _nss_create_tablename (errnop);
 
       if (status != NSS_STATUS_SUCCESS)
 	return status;
     }
 
-  int parse_res;
-  nis_result *result;
-  char buf[8 + 3 * sizeof (unsigned long int) + pwd_tablename_len];
-  int olderr = errno;
-
-  snprintf (buf, sizeof (buf), "[uid=%lu],%s",
-	    (unsigned long int) uid, pwd_tablename_val);
-
-  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM, NULL, NULL);
-
-  if (result == NULL)
-    {
-      *errnop = ENOMEM;
-      return NSS_STATUS_TRYAGAIN;
-    }
-
-  if (__builtin_expect (niserr2nss (result->status) != NSS_STATUS_SUCCESS, 0))
-    {
-      enum nss_status status = niserr2nss (result->status);
+  {
+    int parse_res;
+    nis_result *result;
+    char buf[100 + tablename_len];
+    int olderr = errno;
 
-      __set_errno (olderr);
+    sprintf (buf, "[uid=%lu],%s", (unsigned long int) uid, tablename_val);
 
-      nis_freeresult (result);
-      return status;
-    }
+    result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 
-  parse_res = _nss_nisplus_parse_pwent (result, pw, buffer, buflen, errnop);
+    if (result == NULL)
+      {
+	*errnop = ENOMEM;
+	return NSS_STATUS_TRYAGAIN;
+      }
+    if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+      {
+	enum nss_status status = niserr2nss (result->status);
 
-  nis_freeresult (result);
+	__set_errno (olderr);
 
-  if (__builtin_expect (parse_res < 1, 0))
-    {
-      if (parse_res == -1)
-	{
-	  *errnop = ERANGE;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      else
-	{
-	  __set_errno (olderr);
-	  return NSS_STATUS_NOTFOUND;
-	}
-    }
-
-  return NSS_STATUS_SUCCESS;
+	nis_freeresult (result);
+	return status;
+      }
+
+    parse_res = _nss_nisplus_parse_pwent (result, pw, buffer, buflen, errnop);
+
+    nis_freeresult (result);
+
+    if (parse_res < 1)
+      {
+	if (parse_res == -1)
+	  {
+	    *errnop = ERANGE;
+	    return NSS_STATUS_TRYAGAIN;
+	  }
+	else
+	  {
+	    __set_errno (olderr);
+	    return NSS_STATUS_NOTFOUND;
+	  }
+      }
+    return NSS_STATUS_SUCCESS;
+  }
 }