diff --git a/ChangeLog b/ChangeLog
index 5d6a1cb6e0..b3f743635c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-11  Roland McGrath  <roland@redhat.com>
 
+	* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)): Return errno
+	instead of always EAGAIN when status is NSS_STATUS_TRYAGAIN.
+
 	* sysdeps/generic/dl-environ.c (unsetenv): Redo last fix without
 	strncmp, keeps the code smaller for a non-performance-critical case.
 
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 630cea4158..58cf29300f 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -243,7 +243,7 @@ done:
   POSTPROCESS;
 #endif
   return (status == NSS_STATUS_SUCCESS
-	  ? 0 : (status == NSS_STATUS_TRYAGAIN ? EAGAIN : ENOENT));
+	  ? 0 : (status == NSS_STATUS_TRYAGAIN ? errno : ENOENT));
 }