From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 4 Jul 2024 15:26:34 +0000 (+0200)
Subject: Use bclose_from() in daemon.c
X-Git-Tag: Release-15.0.3~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e259c5066902902832e272955e28acc4fac99e9e;p=thirdparty%2Fbacula.git

Use bclose_from() in daemon.c
---

diff --git a/bacula/src/lib/daemon.c b/bacula/src/lib/daemon.c
index a8ef8d81a..f18690291 100644
--- a/bacula/src/lib/daemon.c
+++ b/bacula/src/lib/daemon.c
@@ -75,27 +75,7 @@ daemon_start()
       next_fd = 3;                    /* don't close debug output */
    }
 
-#if defined(HAVE_FCNTL_F_CLOSEM)
-   fcntl(next_fd, F_CLOSEM);
-#elif defined(HAVE_CLOSEFROM)
-   closefrom(next_fd);
-#else
-   struct rlimit rl;
-   int64_t rlimitResult=0;
-
-   /* Many systems doesn't have the correct system call
-    * to determine the FD list to close.
-    */
-   if (getrlimit(RLIMIT_NOFILE, &rl) == -1) {
-      rlimitResult = sysconf(_SC_OPEN_MAX);
-   } else {
-      rlimitResult = rl.rlim_max;
-   }
-
-   for (i=rlimitResult; i >= next_fd; i--) {
-      close(i);
-   }
-#endif
+   bclose_from(next_fd);
 
    /* Move to root directory. For debug we stay
     * in current directory so dumps go there.