* nss/getnssent_r.c (__nss_getent_r): Use EAGAIN instead of errno

	when using h_errno and it's not set to NETDB_INTERNAL.
	* nss/getXXbyYY_r.c [NEED_H_ERRNO]: Likewise.

	* Makefile ($(common-objpfx)testrun.sh): New target.
	(others): Depend on it.
	(postclean-generated): Append it.

diff --git a/ChangeLog b/ChangeLog
index 688e0d52bf855333d56bf26969ab75893da53937..87c225bdb373c8d9d8894af340808c26a068007d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-09-11  Roland McGrath  <roland@redhat.com>
 
+       * nss/getnssent_r.c (__nss_getent_r): Use EAGAIN instead of errno
+       when using h_errno and it's not set to NETDB_INTERNAL.
+       * nss/getXXbyYY_r.c [NEED_H_ERRNO]: Likewise.
+
+       * Makefile ($(common-objpfx)testrun.sh): New target.
+       (others): Depend on it.
+       (postclean-generated): Append it.
+
        * nss/bug-erange.c: New file.
        * nss/Makefile (tests): Add it.
 

diff --git a/Makefile b/Makefile
index 1c40af0506435794a202d2002d4f9e2e4c625886..41f571e95a93de7c3bc19893cb14ade15a8caa1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -130,6 +130,21 @@ ifeq (yes,$(build-shared))
 # Build the shared object from the PIC object library.
 lib: $(common-objpfx)libc.so
 endif
+
+
+# This is a handy script for running any dynamically linked program against
+# the current libc build for testing.
+$(common-objpfx)testrun.sh: $(common-objpfx)config.make \
+                           $(..)Makeconfig $(..)Makefile
+       (echo '#!/bin/sh'; \
+        echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \
+        echo 'exec $(run-program-prefix) $${1+"$$@"}'; \
+       ) > $@T
+       chmod a+x $@T
+       mv -f $@T $@
+postclean-generated += testrun.sh
+
+others: $(common-objpfx)testrun.sh
 \f
 # Makerules creates a file `stubs' in each subdirectory, which
 # contains `#define __stub_FUNCTION' for each function defined in that

diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 58cf29300fad4adf403f7348ca5cba02ddd2d6b8..020848024b567316d23923043a89fc63790c892d 100644 (file)
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -244,6 +244,13 @@ done:
 #endif
   return (status == NSS_STATUS_SUCCESS
          ? 0 : (status == NSS_STATUS_TRYAGAIN ? errno : ENOENT));
+  return (status == NSS_STATUS_SUCCESS ? 0
+         : status != NSS_STATUS_TRYAGAIN ? ENOENT
+#ifdef NEED_H_ERRNO
+         /* These functions only set errno if h_errno is NETDB_INTERNAL.  */
+         : *h_errnop != NETDB_INTERNAL ? EAGAIN
+#endif
+         : errno);
 }
 
 

diff --git a/nss/getnssent_r.c b/nss/getnssent_r.c
index 39c867ce7940ee515fc1e615d6bd4ecd015dca05..c1f8965363ac484681ce3425d5e59aee40349385 100644 (file)
--- a/nss/getnssent_r.c
+++ b/nss/getnssent_r.c
@@ -197,6 +197,9 @@ __nss_getent_r (const char *getent_func_name,
     }
 
   *result = status == NSS_STATUS_SUCCESS ? resbuf : NULL;
-  return (status == NSS_STATUS_SUCCESS
-         ? 0 : status == NSS_STATUS_TRYAGAIN ? errno : ENOENT);
+  return (status == NSS_STATUS_SUCCESS ? 0
+         : status != NSS_STATUS_TRYAGAIN ? ENOENT
+         /* h_errno functions only set errno if h_errno is NETDB_INTERNAL.  */
+         : (h_errnop == NULL || *h_errnop == NETDB_INTERNAL) ? errno
+         : EAGAIN);
 }