Update.

[thirdparty/glibc.git] / nis / nss_nisplus / nisplus-pwd.c

diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c
index f7bc8321bd2e0dd5cbafa0b41416fe32bb3c652c..a4beb7af146ccfc62b62b5f9414e39b6548f396f 100644 (file)
--- a/nis/nss_nisplus/nisplus-pwd.c
+++ b/nis/nss_nisplus/nisplus-pwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -186,6 +186,7 @@ _nss_nisplus_getpwnam_r (const char *name, struct passwd *pw,
     {
       nis_result *result;
       char buf[strlen (name) + 24 + tablename_len];
+      int olderr = errno;
 
       sprintf (buf, "[name=%s],%s", name, tablename_val);
 
@@ -195,6 +196,8 @@ _nss_nisplus_getpwnam_r (const char *name, struct passwd *pw,
        {
          enum nss_status status =  niserr2nss (result->status);
 
+         __set_errno (olderr);
+
          nis_freeresult (result);
          return status;
        }
@@ -212,7 +215,10 @@ _nss_nisplus_getpwnam_r (const char *name, struct passwd *pw,
              return NSS_STATUS_TRYAGAIN;
            }
          else
-           return NSS_STATUS_NOTFOUND;
+           {
+             __set_errno (olderr);
+             return NSS_STATUS_NOTFOUND;
+           }
        }
       return NSS_STATUS_SUCCESS;
     }
@@ -234,6 +240,7 @@ _nss_nisplus_getpwuid_r (const uid_t uid, struct passwd *pw,
     int parse_res;
     nis_result *result;
     char buf[100 + tablename_len];
+    int olderr = errno;
 
     sprintf (buf, "[uid=%lu],%s", (unsigned long int) uid, tablename_val);
 
@@ -243,6 +250,8 @@ _nss_nisplus_getpwuid_r (const uid_t uid, struct passwd *pw,
       {
        enum nss_status status = niserr2nss (result->status);
 
+       __set_errno (olderr);
+
        nis_freeresult (result);
        return status;
       }
@@ -259,7 +268,10 @@ _nss_nisplus_getpwuid_r (const uid_t uid, struct passwd *pw,
            return NSS_STATUS_TRYAGAIN;
          }
        else
-         return NSS_STATUS_NOTFOUND;
+         {
+           __set_errno (olderr);
+           return NSS_STATUS_NOTFOUND;
+         }
       }
     return NSS_STATUS_SUCCESS;
   }