1 files changed, 9 insertions, 16 deletions

diff --git a/contrib/apparmor/gnunet-service-testbed b/contrib/apparmor/gnunet-service-testbed
index 06e8f36ea..24f5c4525 100644
--- a/contrib/apparmor/gnunet-service-testbed
+++ b/contrib/apparmor/gnunet-service-testbed
@@ -2,8 +2,10 @@
 #include <tunables/global>
 #include <tunables/gnunet>
 
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed flags=(complain) {
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed {
+  #include <abstractions/base>
   #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-test>
 
   /etc/gai.conf r,
  
@@ -11,26 +13,17 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed flags=(compla
   /tmp/gnunet-system-runtime/gnunet-service-testbed-barrier.sock w,
   /tmp/gnunet-system-runtime/gnunet-service-testbed.sock w,
 
-  /usr/lib/ld-*.so r,
-
-  /dev/null r,
-
   @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-* r,
 
   @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
   @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm Px,
   @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed mr,
 
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetarm.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettestbed.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettesting.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-
   @{GNUNET_PREFIX}/share/gnunet/testing_hostkeys.ecc r,
-
+  
+  #GNUnet helper
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed Px,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
 }