From 8312ea47f754bc0962f4c92d8aa6a77c0d5c43a0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 17 Oct 2009 21:37:11 +0200
Subject: dfork: honour _SC_OPEN_MAX

---
 libdaemon/dfork.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libdaemon/dfork.c b/libdaemon/dfork.c
index 62469bb..5f163fd 100644
--- a/libdaemon/dfork.c
+++ b/libdaemon/dfork.c
@@ -479,7 +479,7 @@ int daemon_close_all(int except_fd, ...) {
 /** Same as daemon_close_all but takes an array of fds, terminated by -1 */
 int daemon_close_allv(const int except_fds[]) {
     struct rlimit rl;
-    int fd;
+    int fd, maxfd;
 
 #ifdef __linux__
     int saved_errno;
@@ -549,15 +549,14 @@ int daemon_close_allv(const int except_fds[]) {
 
 #endif
 
-    if (getrlimit(RLIMIT_NOFILE, &rl) < 0)
-        return -1;
+    if (getrlimit(RLIMIT_NOFILE, &rl) > 0)
+        maxfd = (int) rl.rlim_max;
+    else
+        maxfd = sysconf(_SC_OPEN_MAX);
 
-    for (fd = 0; fd < (int) rl.rlim_max; fd++) {
+    for (fd = 3; fd < maxfd; fd++) {
         int i, found;
 
-        if (fd <= 3)
-            continue;
-
         if (fd == _daemon_retval_pipe[1])
             continue;
 
-- 
cgit