ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source 
when libcap-devel is installed. [RT #34838]

(cherry picked from commit 7433a204d3)
(cherry picked from commit 9b7d05c900)
This commit is contained in:
Mark Andrews
2013-09-26 15:26:43 +10:00
parent e3f0a6a347
commit 3f00a920fa
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

@@ -5,6 +5,9 @@
on some platforms. This could cause INSIST failures
when serving NSEC3 signed zones. [RT #35120]
3658. [port] linux: Address platform specific compilation issue
when libcap-devel is installed. [RT #34838]
--- 9.9.4-P1 released ---
3656. [bug] Treat an all zero netmask as invalid when generating

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_caps = ISC_FALSE;
#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
#endif
#ifdef HAVE_SYS_CAPABILITY_H
#include <sys/capability.h>
#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
* anything from it, and the files it includes cause warnings with 2.2

21
configure vendored
View File

@@ -17764,17 +17764,28 @@ fi
done
for ac_header in linux/capability.h sys/capability.h
for ac_header in sys/capability.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H
ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
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>
#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
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
#define HAVE_LINUX_CAPABILITY_H 1
_ACEOF
fi

3
configure.in
View File

@@ -2549,7 +2549,8 @@ AC_ARG_ENABLE(linux-caps,
case "$enable_linux_caps" in
yes|'')
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
#include <linux/types.h>
#endif