Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
631
Issues
631
List
Boards
Labels
Service Desk
Milestones
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
BIND
Commits
7433a204
Commit
7433a204
authored
Sep 26, 2013
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3658. [port] linux: Address platform specific compilation issue
when libcap-devel is installed. [RT #34838]
parent
1a4725be
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
9 deletions
+24
-9
CHANGES
CHANGES
+3
-0
bin/named/unix/os.c
bin/named/unix/os.c
+3
-3
configure
configure
+16
-5
configure.in
configure.in
+2
-1
No files found.
CHANGES
View file @
7433a204
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
calling add_history. [RT #34842]
...
...
bin/named/unix/os.c
View file @
7433a204
...
...
@@ -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
...
...
configure
View file @
7433a204
...
...
@@ -18066,17 +18066,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
...
...
configure.in
View file @
7433a204
...
...
@@ -2637,7 +2637,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
...
...
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