From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 25 Jan 2019 22:52:34 +0000 (+0100)
Subject: replace: only include <sys/capability.h> with HAVE_POSIX_CAPABILITIES
X-Git-Tag: ldb-1.6.1~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e49df24e80a1c0bc2a1cc46c026e2aebfd5d6ddd;p=thirdparty%2Fsamba.git

replace: only include <sys/capability.h> with HAVE_POSIX_CAPABILITIES

On FreeBSD <sys/capability.h> is a legacy wrapper to <sys/capsicum.h>,
which implements something different. With FreeBSD 12 including
<sys/capability.h> generates a compiler warning/error.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h
index a7b78f02756..44b8d5127a9 100644
--- a/lib/replace/system/capability.h
+++ b/lib/replace/system/capability.h
@@ -37,7 +37,9 @@
 #define BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND
 #endif
 
+#ifdef HAVE_POSIX_CAPABILITIES
 #include <sys/capability.h>
+#endif
 
 #ifdef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND
 #undef _LINUX_TYPES_H