Diff between a3671b9d0e7b9df21a1539d3e952b099900b8d10 and 99dd125c52150ffc88076d53948a8936cabe5c97

Changed Files

File Additions Deletions Status
Makefile.am +2 -2 modified
bootstrap-configure +0 -1 modified
configure.ac +0 -10 modified
src/main.c +0 -13 modified

Full Patch

diff --git a/Makefile.am b/Makefile.am
index 9c2a677..d223a7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -306,7 +306,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
 			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
 
@@ -428,7 +428,7 @@ EXTRA_DIST += doc/manager-api.txt \
 
 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
@@ -16,7 +16,6 @@ fi
 		--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
@@ -52,16 +52,6 @@ AC_PATH_CHECK
 
 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
@@ -55,10 +55,6 @@
 #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
@@ -462,15 +458,6 @@ int main(int argc, char *argv[])
 
 	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);