From 77855e8509e7d993a9bec21e621064c4b1c5b189 Mon Sep 17 00:00:00 2001
From: William Brown <firstyear@redhat.com>
Date: Mon, 21 Aug 2017 15:45:58 +1000
Subject: [PATCH] Ticket - 49359 - sysconf by default

Bug Description:  Through out the code we are inconsistent about our
use of sysconf or getdtablesize. We have some defines that are not
consistent (such as use_sysconf OR linux) and other places that just
look for use sysconf.

Fix Description:  Just use sysconf

https://pagure.io/389-ds-base/issue/49359

Author: wibrown

Review by: ???
---
 ldap/include/portable.h        | 7 -------
 ldap/servers/slapd/detach.c    | 6 ------
 ldap/servers/slapd/libglobs.c  | 6 ------
 ldap/servers/slapd/localhost.c | 2 --
 4 files changed, 21 deletions(-)

diff --git a/ldap/include/portable.h b/ldap/include/portable.h
index 63cc4d4..8b74c4e 100644
--- a/ldap/include/portable.h
+++ b/ldap/include/portable.h
@@ -41,13 +41,6 @@
 #endif
 
 /*
- * under System V, use sysconf() instead of getdtablesize
- */
-#if !defined(USE_SYSCONF) && defined(SYSV)
-#define USE_SYSCONF
-#endif
-
-/*
  * under System V, daemons should use setsid() instead of detaching from their
  * tty themselves
  */
diff --git a/ldap/servers/slapd/detach.c b/ldap/servers/slapd/detach.c
index 681e6a7..ff7271d 100644
--- a/ldap/servers/slapd/detach.c
+++ b/ldap/servers/slapd/detach.c
@@ -40,9 +40,7 @@
 #include "slap.h"
 #include "fe.h"
 
-#if defined(USE_SYSCONF) || defined(LINUX)
 #include <unistd.h>
-#endif /* USE_SYSCONF */
 
 static int
 set_workingdir(void)
@@ -194,11 +192,7 @@ close_all_files()
 {
     int i, nbits;
 
-#ifdef USE_SYSCONF
     nbits = sysconf(_SC_OPEN_MAX);
-#else  /* USE_SYSCONF */
-    nbits = getdtablesize();
-#endif /* USE_SYSCONF */
 
     for (i = 3; i < nbits; i++) {
         close(i);
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 6a8ab15..6d6f376 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -122,9 +122,7 @@
 #include <netdb.h>
 #include <unistd.h>
 #include <pwd.h> /* pwdnam */
-#ifdef USE_SYSCONF
 #include <unistd.h>
-#endif /* USE_SYSCONF */
 #include "slap.h"
 #include "plhash.h"
 #if defined(LINUX)
@@ -1459,11 +1457,7 @@ FrontendConfig_init(void)
 
     cfg->SSLclientAuth = SLAPD_DEFAULT_SSLCLIENTAUTH;
 
-#ifdef USE_SYSCONF
     cfg->conntablesize = sysconf(_SC_OPEN_MAX);
-#else  /* USE_SYSCONF */
-    cfg->conntablesize = getdtablesize();
-#endif /* USE_SYSCONF */
 
     init_accesscontrol = cfg->accesscontrol = LDAP_ON;
 #if defined(LINUX)
diff --git a/ldap/servers/slapd/localhost.c b/ldap/servers/slapd/localhost.c
index f2aff28..bb198b1 100644
--- a/ldap/servers/slapd/localhost.c
+++ b/ldap/servers/slapd/localhost.c
@@ -24,9 +24,7 @@
 #include <resolv.h>
 #include <errno.h>
 #include "slap.h"
-#if defined(USE_SYSCONF) || defined(LINUX) || defined(__FreeBSD__)
 #include <unistd.h>
-#endif /* USE_SYSCONF */
 
 #include <ssl.h>
 #include "fe.h"
-- 
1.8.3.1