From: Andreas Gustafsson <source@isc.org>
Date: Sat, 9 Jun 2001 00:58:11 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.1.3rc2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8426e6e681c0c6881ead5b5bb0a702bf6486386;p=thirdparty%2Fbind9.git

pullup:
 704.   [port]          RLIMIT_NOFILE in to available on all platforms.
                        [RT #695]
---

diff --git a/CHANGES b/CHANGES
index 81ec968382f..cf76b132645 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,8 @@
  705.	[port]		Work out resource limit type for use where rlim_t is
 			not available. [RT #695]
 
+ 704.	[port]		RLIMIT_NOFILE is not available on all platforms.
+
 	--- 9.1.3rc1 released ---
 
  831.	[bug]		The configure script tried to determine
diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index fce33529b9a..0e1e4eca40d 100644
--- a/lib/isc/unix/resource.c
+++ b/lib/isc/unix/resource.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.c,v 1.6.2.2 2001/06/09 00:53:21 gson Exp $ */
+/* $Id: resource.c,v 1.6.2.3 2001/06/09 00:58:11 gson Exp $ */
 
 #include <config.h>
 
@@ -59,7 +59,11 @@ resource2rlim(isc_resource_t resource, int *rlim_resource) {
 #endif
 		break;
 	case isc_resource_openfiles:
+#ifdef RLIMIT_NOFILE
 		*rlim_resource = RLIMIT_NOFILE;
+#else
+		result = ISC_R_NOTIMPLEMENTED;
+#endif
 		break;
 	case isc_resource_processes:
 #ifdef RLIMIT_NPROC