diff --git a/bin/named/main.c b/bin/named/main.c
index af73a25d8d..3673894767 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.c,v 1.92 2000/11/14 23:59:20 tale Exp $ */
+/* $Id: main.c,v 1.93 2000/11/15 02:11:47 tale Exp $ */
 
 #include <config.h>
 
@@ -476,10 +476,14 @@ setup(void) {
 	/*
 	 * Get the initial resource limits.
 	 */
-	ns_g_initstacksize = isc_resource_getlimit(isc_resource_stacksize);
-	ns_g_initdatasize  = isc_resource_getlimit(isc_resource_datasize);
-	ns_g_initcoresize  = isc_resource_getlimit(isc_resource_coresize);
-	ns_g_initopenfiles = isc_resource_getlimit(isc_resource_openfiles);
+	(void)isc_resource_getlimit(isc_resource_stacksize,
+				    &ns_g_initstacksize);
+	(void)isc_resource_getlimit(isc_resource_datasize,
+				    &ns_g_initdatasize);
+	(void)isc_resource_getlimit(isc_resource_coresize,
+				    &ns_g_initcoresize);
+	(void)isc_resource_getlimit(isc_resource_openfiles,
+				    &ns_g_initopenfiles);
 
 	result = create_managers();
 	if (result != ISC_R_SUCCESS)
diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h
index 44c2d4671e..d0b8ee4dc1 100644
--- a/lib/isc/include/isc/resource.h
+++ b/lib/isc/include/isc/resource.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.h,v 1.2 2000/11/15 01:31:45 gson Exp $ */
+/* $Id: resource.h,v 1.3 2000/11/15 02:11:48 tale Exp $ */
 
 #ifndef ISC_RESOURCE_H
 #define ISC_RESOURCE_H 1
@@ -43,16 +43,19 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value);
  *
  * Returns:
  *	ISC_R_SUCCESS	Success.
+ *	ISC_R_NOTIMPLEMENTED	'resource' is not a type known by the OS.
  *	ISC_R_NOPERM	The calling process did not have adequate permission
  *			to change the resource limit.
  */
 
-isc_resourcevalue_t
-isc_resource_getlimit(isc_resource_t resource);
+isc_result_t
+isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value);
 /*
  * Get the maximum limit for a system resource.
  *
  * Notes:
+ *	'value' is set to the maximum limit.
+ *
  *	ISC_RESOURCE_UNLIMITED is the maximum value of isc_resourcevalue_t.
  *
  *	On many (all?) Unix systems, RLIM_INFINITY is a valid value that is
@@ -72,9 +75,11 @@ isc_resource_getlimit(isc_resource_t resource);
  *	'resource' is a valid member of the isc_resource_t enumeration.
  *
  * Returns:
- *	The current setting of the maximum limit for a system resource.
+ *	ISC_R_SUCCESS		Success.
+ *	ISC_R_NOTIMPLEMENTED	'resource' is not a type known by the OS.
  */
 
 ISC_LANG_ENDDECLS
 
 #endif /* ISC_RESOURCE_H */
+
diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index de66418233..b45dd623d7 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.1 2000/11/14 23:38:10 tale Exp $ */
+/* $Id: resource.c,v 1.2 2000/11/15 02:11:50 tale Exp $ */
 
 #include <sys/types.h>
 #include <sys/resource.h>
@@ -26,27 +26,41 @@
 
 #include "errno2result.h"
 
-static int
-resource2rlim(isc_resource_t resource) {
+static isc_result_t
+resource2rlim(isc_resource_t resource, int *rlim_resource) {
+	isc_result_t result = ISC_R_SUCCESS;
+
 	switch (resource) {
 	case isc_resource_coresize:
-		return (RLIMIT_CORE);
+		*rlim_resource = RLIMIT_CORE;
 	case isc_resource_cputime:
-		return (RLIMIT_CPU);
+		*rlim_resource = RLIMIT_CPU;
 	case isc_resource_datasize:
-		return (RLIMIT_DATA);
+		*rlim_resource = RLIMIT_DATA;
 	case isc_resource_filesize:
-		return (RLIMIT_FSIZE);
+		*rlim_resource = RLIMIT_FSIZE;
 	case isc_resource_lockedmemory:
-		return (RLIMIT_MEMLOCK);
+#ifdef RLIMIT_MEMLOCK
+		*rlim_resource = RLIMIT_MEMLOCK;
+#else
+		result = ISC_R_NOTIMPLEMENTED;
+#endif
 	case isc_resource_openfiles:
-		return (RLIMIT_NOFILE);
+		*rlim_resource = RLIMIT_NOFILE;
 	case isc_resource_processes:
-		return (RLIMIT_NPROC);
+#ifdef RLIMIT_NPROC
+		*rlim_resource = RLIMIT_NPROC;
+#else
+		result = ISC_R_NOTIMPLEMENTED;
+#endif
 	case isc_resource_residentsize:
-		return (RLIMIT_RSS);
+#ifdef RLIMIT_RSS
+		*rlim_resource = RLIMIT_RSS;
+#else
+		result = ISC_R_NOTIMPLEMENTED;
+#endif
 	case isc_resource_stacksize:
-		return (RLIMIT_STACK);
+		*rlim_resource = RLIMIT_STACK;
 	default:
                 /*
 		 * This test is not very robust if isc_resource_t
@@ -54,13 +68,11 @@ resource2rlim(isc_resource_t resource) {
 		 */
 		REQUIRE(resource >= isc_resource_coresize &&
 			resource <= isc_resource_stacksize);
-		/*
-		 * This return value is not really meant to be checked
-		 * by the caller, as the contract for the public functions
-		 * is that 'resource' be a member of the enumeration.
-		 */
-		return (-1);
+
+		result = ISC_R_RANGE;
 	}
+
+	return (result);
 }
 
 isc_result_t
@@ -69,8 +81,11 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) {
 	rlim_t rlim_value;
 	int unixresult;
 	int unixresource;
+	isc_result_t result;
 
-	unixresource = resource2rlim(resource);
+	result = resource2rlim(resource, &unixresource);
+	if (result != ISC_R_SUCCESS)
+		return (result);
 
 	if (value == ISC_RESOURCE_UNLIMITED)
 		rlim_value = RLIM_INFINITY;
@@ -152,16 +167,19 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) {
 		return (isc__errno2result(errno));
 }
 
-isc_resourcevalue_t
-isc_resource_getlimit(isc_resource_t resource) {
+isc_result_t
+isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) {
 	int unixresult;
 	int unixresource;
 	struct rlimit rl;
+	isc_result_t result;
 
-	unixresource = resource2rlim(resource);
-	unixresult = getrlimit(unixresource, &rl);
+	result = resource2rlim(resource, &unixresource);
+	if (result == ISC_R_SUCCESS) {
+		unixresult = getrlimit(unixresource, &rl);
+		INSIST(unixresult == 0);
+		*value = rl.rlim_max;
+	}
 
-	INSIST(unixresult == 0);
-
-	return (rl.rlim_max);
+	return (result);
 }