mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 23:55:27 +00:00
Code Issues Releases Wiki Activity

3658. [port] linux: Address platform specific compilation issue

Browse Source 
when libcap-devel is installed. [RT #34838]
This commit is contained in:
Mark Andrews
2013-09-26 15:26:43 +10:00
parent 1a4725bef2
commit 7433a204d3
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3658. [port] linux: Address platform specific compilation issue
when libcap-devel is installed. [RT #34838]
3657. [port] Some readline clones don't accept NULL pointers when 3657. [port] Some readline clones don't accept NULL pointers when
calling add_history. [RT #34842] calling add_history. [RT #34842]

6
bin/named/unix/os.c
View File

@@ -117,12 +117,12 @@ static int dfd[2] = { -1, -1 };
static isc_boolean_t non_root = ISC_FALSE; static isc_boolean_t non_root = ISC_FALSE;
static isc_boolean_t non_root_caps = ISC_FALSE; static isc_boolean_t non_root_caps = ISC_FALSE;
#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
#endif
#ifdef HAVE_SYS_CAPABILITY_H #ifdef HAVE_SYS_CAPABILITY_H
#include <sys/capability.h> #include <sys/capability.h>
#else #else
#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
#endif
/*% /*%
* We define _LINUX_FS_H to prevent it from being included. We don't need * We define _LINUX_FS_H to prevent it from being included. We don't need
* anything from it, and the files it includes cause warnings with 2.2 * anything from it, and the files it includes cause warnings with 2.2

21
configure vendored
View File

@@ -18066,17 +18066,28 @@ fi
done done
for ac_header in linux/capability.h sys/capability.h for ac_header in sys/capability.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H if test "x$ac_cv_header_sys_capability_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_CAPABILITY_H 1
_ACEOF
fi
done
for ac_header in linux/capability.h
do :
ac_fn_c_check_header_compile "$LINENO" "linux/capability.h" "ac_cv_header_linux_capability_h" "#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h> #include <linux/types.h>
#endif #endif
" "
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : if test "x$ac_cv_header_linux_capability_h" = xyes; then :
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 #define HAVE_LINUX_CAPABILITY_H 1
_ACEOF _ACEOF
fi fi

3
configure.in
View File

@@ -2637,7 +2637,8 @@ AC_ARG_ENABLE(linux-caps,
case "$enable_linux_caps" in case "$enable_linux_caps" in
yes|'') yes|'')
AC_CHECK_HEADERS(linux/types.h) AC_CHECK_HEADERS(linux/types.h)
AC_CHECK_HEADERS([linux/capability.h sys/capability.h], [], [], AC_CHECK_HEADERS([sys/capability.h])
AC_CHECK_HEADERS([linux/capability.h], [], [],
[#ifdef HAVE_LINUX_TYPES_H [#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h> #include <linux/types.h>
#endif #endif