diff --git a/Makefile.am b/Makefile.am
index 9c2a677..d223a7a 100644
--- a/Makefile.am
+++ b/Makefile.am
src/event.h src/event.c \
src/oob.h src/oob.c src/eir.h src/eir.c
src_bluetoothd_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @DBUS_LIBS@ \
- @CAPNG_LIBS@ -ldl -lrt
+ -ldl -lrt
src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
-Wl,--version-script=$(srcdir)/src/bluetooth.ver
AM_YFLAGS = -d
-AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@
+AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
diff --git a/bootstrap-configure b/bootstrap-configure
index e5f9daa..f00d1d4 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/lib \
- --enable-capng \
--enable-health \
--enable-tools \
--enable-bccmd \
diff --git a/configure.ac b/configure.ac
index 44f33ad..5ebdafb 100644
--- a/configure.ac
+++ b/configure.ac
AC_ARG_BLUEZ
-AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng],
- [enable capabilities support]), [enable_capng=${enableval}])
-if (test "${enable_capng}" = "yes"); then
- PKG_CHECK_MODULES(CAPNG, libcap-ng, dummy=yes,
- AC_MSG_ERROR(Capabilities library is required))
- AC_SUBST(CAPNG_CFLAGS)
- AC_SUBST(CAPNG_LIBS)
- AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
-fi
-
AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
[path to systemd system service directory]), [path_systemdunit=${withval}],
[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
diff --git a/src/main.c b/src/main.c
index b062b4a..286baa0 100644
--- a/src/main.c
+++ b/src/main.c
#include "agent.h"
#include "manager.h"
-#ifdef HAVE_CAPNG
-#include <cap-ng.h>
-#endif
-
#define BLUEZ_NAME "org.bluez"
#define LAST_ADAPTER_EXIT_TIMEOUT 30
init_defaults();
-#ifdef HAVE_CAPNG
- /* Drop capabilities */
- capng_clear(CAPNG_SELECT_BOTH);
- capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
- CAP_NET_BIND_SERVICE, CAP_NET_ADMIN,
- CAP_NET_RAW, CAP_IPC_LOCK, -1);
- capng_apply(CAPNG_SELECT_BOTH);
-#endif
-
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);