Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
c174d5c1
Commit
c174d5c1
authored
Jul 10, 2013
by
Evan Hunt
Browse files
[master] portability fix
3614. [port] Check for <linux/types.h>. [RT #34162]
parent
77b1d950
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
c174d5c1
3614. [port] Check for <linux/types.h>. [RT #34162]
3613. [bug] named could crash when deleting inline-signing
zones with "rndc delzone". [RT #34066]
...
...
bin/named/unix/os.c
View file @
c174d5c1
...
...
@@ -117,6 +117,9 @@ 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
...
...
config.h.in
View file @
c174d5c1
...
...
@@ -284,6 +284,9 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the <linux/capability.h> header file. */
#undef HAVE_LINUX_CAPABILITY_H
/* Define to 1 if you have the <linux/types.h> header file. */
#undef HAVE_LINUX_TYPES_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
...
...
configure
View file @
c174d5c1
...
...
@@ -18033,10 +18033,26 @@ fi
case "$enable_linux_caps" in
yes|'')
for ac_header in linux/capability.h sys/capability.h
for ac_header in linux/types.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_types_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LINUX_TYPES_H 1
_ACEOF
fi
done
for ac_header in linux/capability.h sys/capability.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
#endif
"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
...
...
configure.in
View file @
c174d5c1
...
...
@@ -2618,7 +2618,12 @@ AC_ARG_ENABLE(linux-caps,
[ --disable-linux-caps disable linux capabilities])
case "$enable_linux_caps" in
yes|'')
AC_CHECK_HEADERS(linux/capability.h sys/capability.h)
AC_CHECK_HEADERS(linux/types.h)
AC_CHECK_HEADERS([linux/capability.h sys/capability.h], [], [],
[#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
#endif
])
AC_CHECK_LIB(cap, cap_set_proc)
;;
no)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment