From: Mark Andrews <marka@isc.org>
Date: Fri, 13 Feb 2009 09:15:18 +0000 (+0000)
Subject: 2549.   [port]          linux: define NR_OPEN if not currently defined.
X-Git-Tag: v9.3.6-P2~4^2~35
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6cf047f100e35ef9ea0dc1aed3f05cd3c4ee3c3d;p=thirdparty%2Fbind9.git

2549.   [port]          linux: define NR_OPEN if not currently defined.
                        [RT #19344]
---

diff --git a/CHANGES b/CHANGES
index 6befd52f3fd..cf82d918344 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2549.	[port]		linux: define NR_OPEN if not currently defined.
+			[RT #19344]
+
 2548.	[bug]		Install iterated_hash.h. [RT #19335]
 
 2547.	[bug]		openssl_link.c:mem_realloc() could reference an
diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index 0970e4ed335..6e8e0aa9974 100644
--- a/lib/isc/unix/resource.c
+++ b/lib/isc/unix/resource.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.c,v 1.21 2008/08/05 07:04:49 marka Exp $ */
+/* $Id: resource.c,v 1.22 2009/02/13 09:15:18 marka Exp $ */
 
 #include <config.h>
 
@@ -159,7 +159,11 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) {
 		if (unixresult == 0)
 			return (ISC_R_SUCCESS);
 	}
-#elif defined(NR_OPEN) && defined(__linux__)
+#elif defined(__linux__)
+#ifndef NR_OPEN
+#define NR_OPEN (1024*1024)
+#endif
+
 	/*
 	 * Some Linux kernels don't accept RLIM_INFINIT; the maximum
 	 * possible value is the NR_OPEN defined in linux/fs.h.