diff --git a/profiles/Makefile b/profiles/Makefile index b68c2ac4b..a388339c3 100644 --- a/profiles/Makefile +++ b/profiles/Makefile @@ -132,7 +132,7 @@ check-parser: test-dependencies local @echo "*** Checking abstractions from ${ABSTRACTIONS_SOURCE} against apparmor_parser" $(Q)for abstraction in ${CHECK_ABSTRACTIONS} ; do \ [ -n "${VERBOSE}" ] && echo "Testing $${abstraction}" ; \ - echo "abi , #include profile test { #include <$${abstraction}> }" \ + echo "abi , #include profile test { #include <$${abstraction}> }" \ | ${PARSER} --config-file=../parser/tst/parser.conf -S -b ${PWD}/apparmor.d -I ${PWD} > /dev/null \ || exit 1; \ done diff --git a/profiles/apparmor.d/abi/4.0 b/profiles/apparmor.d/abi/4.0 new file mode 100644 index 000000000..9e61fe3d0 --- /dev/null +++ b/profiles/apparmor.d/abi/4.0 @@ -0,0 +1,91 @@ +capability {0xffffff +} +caps {mask {chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore +} +} +dbus {mask {acquire send receive +} +} +domain {attach_conditions {xattr {yes +} +} +change_hat {yes +} +change_hatv {yes +} +change_onexec {yes +} +change_profile {yes +} +computed_longest_left {yes +} +fix_binfmt_elf_mmap {yes +} +post_nnp_subset {yes +} +stack {yes +} +version {1.2 +} +} +file {mask {create read write exec append mmap_exec link lock +} +} +ipc {posix_mqueue {create read write open delete setattr getattr +} +} +mount {mask {mount umount pivot_root +} +} +namespaces {mask {userns_create +} +pivot_root {no +} +profile {yes +} +} +network {af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp +} +af_unix {yes +} +} +network_v8 {af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp +} +} +policy {outofband {0x000001 +} +permstable32 {allow deny subtree cond kill complain prompt audit quiet hide xindex tag label +} +permstable32_version {0x000002 +} +set_load {yes +} +versions {v5 {yes +} +v6 {yes +} +v7 {yes +} +v8 {yes +} +v9 {yes +} +} +} +ptrace {mask {read trace +} +} +query {label {data {yes +} +multi_transaction {yes +} +perms {allow deny audit quiet +} +} +} +rlimit {mask {cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime +} +} +signal {mask {hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost +} +} diff --git a/profiles/apparmor.d/abstractions/X b/profiles/apparmor.d/abstractions/X index ead10d9ad..6f0272d64 100644 --- a/profiles/apparmor.d/abstractions/X +++ b/profiles/apparmor.d/abstractions/X @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/apache2-common b/profiles/apparmor.d/abstractions/apache2-common index e6bcc5eb1..09826352d 100644 --- a/profiles/apparmor.d/abstractions/apache2-common +++ b/profiles/apparmor.d/abstractions/apache2-common @@ -2,7 +2,7 @@ # This file contains basic permissions for Apache and every vHost - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/apparmor_api/change_profile b/profiles/apparmor.d/abstractions/apparmor_api/change_profile index c2dfcba5d..13df61aa3 100644 --- a/profiles/apparmor.d/abstractions/apparmor_api/change_profile +++ b/profiles/apparmor.d/abstractions/apparmor_api/change_profile @@ -6,7 +6,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor.d/abstractions/apparmor_api/examine b/profiles/apparmor.d/abstractions/apparmor_api/examine index 655708bfa..f90a364f0 100644 --- a/profiles/apparmor.d/abstractions/apparmor_api/examine +++ b/profiles/apparmor.d/abstractions/apparmor_api/examine @@ -9,6 +9,6 @@ # Make sure to include at least tunables/proc and tunables/kernelvars # when using this abstraction, if not tunables/global. -abi , +abi , @{PROC}/@{pids}/attr/{apparmor/,}{current,prev,exec} r, diff --git a/profiles/apparmor.d/abstractions/apparmor_api/find_mountpoint b/profiles/apparmor.d/abstractions/apparmor_api/find_mountpoint index d75970e55..dae90c9ce 100644 --- a/profiles/apparmor.d/abstractions/apparmor_api/find_mountpoint +++ b/profiles/apparmor.d/abstractions/apparmor_api/find_mountpoint @@ -6,7 +6,7 @@ # # ------------------------------------------------------------------ -abi , +abi , #permissions needed for aa_find_mountpoint diff --git a/profiles/apparmor.d/abstractions/apparmor_api/introspect b/profiles/apparmor.d/abstractions/apparmor_api/introspect index b88da0a47..00934fb6d 100644 --- a/profiles/apparmor.d/abstractions/apparmor_api/introspect +++ b/profiles/apparmor.d/abstractions/apparmor_api/introspect @@ -6,7 +6,7 @@ # # ------------------------------------------------------------------ -abi , +abi , # Make sure to include at least tunables/proc and tunables/kernelvars # when using this abstraction, if not tunables/global. diff --git a/profiles/apparmor.d/abstractions/apparmor_api/is_enabled b/profiles/apparmor.d/abstractions/apparmor_api/is_enabled index b91e3fa9f..a47b3d4f8 100644 --- a/profiles/apparmor.d/abstractions/apparmor_api/is_enabled +++ b/profiles/apparmor.d/abstractions/apparmor_api/is_enabled @@ -6,7 +6,7 @@ # # ------------------------------------------------------------------ -abi , +abi , # permissions needed for aa_is_enabled diff --git a/profiles/apparmor.d/abstractions/aspell b/profiles/apparmor.d/abstractions/aspell index eff252bd3..f6989d722 100644 --- a/profiles/apparmor.d/abstractions/aspell +++ b/profiles/apparmor.d/abstractions/aspell @@ -1,7 +1,7 @@ # vim:syntax=apparmor # aspell permissions - abi , + abi , # per-user settings and dictionaries owner @{HOME}/.aspell.*.{pws,prepl} rwk, diff --git a/profiles/apparmor.d/abstractions/audio b/profiles/apparmor.d/abstractions/audio index 02dbf25ea..c95016511 100644 --- a/profiles/apparmor.d/abstractions/audio +++ b/profiles/apparmor.d/abstractions/audio @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , /dev/admmidi* rw, diff --git a/profiles/apparmor.d/abstractions/authentication b/profiles/apparmor.d/abstractions/authentication index 65cd0d72f..a063a574b 100644 --- a/profiles/apparmor.d/abstractions/authentication +++ b/profiles/apparmor.d/abstractions/authentication @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # Some services need to perform authentication of users diff --git a/profiles/apparmor.d/abstractions/base b/profiles/apparmor.d/abstractions/base index 05a16946f..a87123a39 100644 --- a/profiles/apparmor.d/abstractions/base +++ b/profiles/apparmor.d/abstractions/base @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/bash b/profiles/apparmor.d/abstractions/bash index 89c1cf1e4..ba2c4e3bc 100644 --- a/profiles/apparmor.d/abstractions/bash +++ b/profiles/apparmor.d/abstractions/bash @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # user-specific bash files @{HOMEDIRS} r, diff --git a/profiles/apparmor.d/abstractions/consoles b/profiles/apparmor.d/abstractions/consoles index aabf3dd51..267cb037a 100644 --- a/profiles/apparmor.d/abstractions/consoles +++ b/profiles/apparmor.d/abstractions/consoles @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # there are three common ways to refer to consoles diff --git a/profiles/apparmor.d/abstractions/crypto b/profiles/apparmor.d/abstractions/crypto index 50852e8af..6a1ed083e 100644 --- a/profiles/apparmor.d/abstractions/crypto +++ b/profiles/apparmor.d/abstractions/crypto @@ -11,7 +11,7 @@ # # ------------------------------------------------------------------ - abi , + abi , @{etc_ro}/gcrypt/hwf.deny r, @{etc_ro}/gcrypt/random.conf r, diff --git a/profiles/apparmor.d/abstractions/cups-client b/profiles/apparmor.d/abstractions/cups-client index 44f36e2b6..a085bd404 100644 --- a/profiles/apparmor.d/abstractions/cups-client +++ b/profiles/apparmor.d/abstractions/cups-client @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # discoverable system configuration for non-local cupsd /etc/cups/client.conf r, diff --git a/profiles/apparmor.d/abstractions/dbus b/profiles/apparmor.d/abstractions/dbus index b96ca09ac..83d44e498 100644 --- a/profiles/apparmor.d/abstractions/dbus +++ b/profiles/apparmor.d/abstractions/dbus @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # This abstraction grants full system bus access. Consider using the # dbus-strict abstraction for fine-grained bus mediation. diff --git a/profiles/apparmor.d/abstractions/dbus-accessibility b/profiles/apparmor.d/abstractions/dbus-accessibility index 3c49a32ff..cade13ee3 100644 --- a/profiles/apparmor.d/abstractions/dbus-accessibility +++ b/profiles/apparmor.d/abstractions/dbus-accessibility @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # This abstraction grants full accessibility bus access. Consider using the # dbus-accessibility-strict abstraction for fine-grained bus mediation. diff --git a/profiles/apparmor.d/abstractions/dbus-accessibility-strict b/profiles/apparmor.d/abstractions/dbus-accessibility-strict index 8fe06ea63..1a0a2937c 100644 --- a/profiles/apparmor.d/abstractions/dbus-accessibility-strict +++ b/profiles/apparmor.d/abstractions/dbus-accessibility-strict @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , dbus send bus=accessibility diff --git a/profiles/apparmor.d/abstractions/dbus-network-manager-strict b/profiles/apparmor.d/abstractions/dbus-network-manager-strict index 9930c80da..849d6ecb5 100644 --- a/profiles/apparmor.d/abstractions/dbus-network-manager-strict +++ b/profiles/apparmor.d/abstractions/dbus-network-manager-strict @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , dbus send bus=system diff --git a/profiles/apparmor.d/abstractions/dbus-session b/profiles/apparmor.d/abstractions/dbus-session index 9b8b979e7..99104c279 100644 --- a/profiles/apparmor.d/abstractions/dbus-session +++ b/profiles/apparmor.d/abstractions/dbus-session @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # This abstraction grants full session bus access. Consider using the # dbus-session-strict abstraction for fine-grained bus mediation. diff --git a/profiles/apparmor.d/abstractions/dbus-session-strict b/profiles/apparmor.d/abstractions/dbus-session-strict index d461d8064..1796a5583 100644 --- a/profiles/apparmor.d/abstractions/dbus-session-strict +++ b/profiles/apparmor.d/abstractions/dbus-session-strict @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # unique per-machine identifier /etc/machine-id r, diff --git a/profiles/apparmor.d/abstractions/dbus-strict b/profiles/apparmor.d/abstractions/dbus-strict index 915195d28..60b5d19ad 100644 --- a/profiles/apparmor.d/abstractions/dbus-strict +++ b/profiles/apparmor.d/abstractions/dbus-strict @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , @{run}/dbus/system_bus_socket rw, diff --git a/profiles/apparmor.d/abstractions/dconf b/profiles/apparmor.d/abstractions/dconf index fc3b3dbd4..1f5b7a073 100644 --- a/profiles/apparmor.d/abstractions/dconf +++ b/profiles/apparmor.d/abstractions/dconf @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # permissions for querying dconf settings; granting write access should # be specified in a specific application's profile. diff --git a/profiles/apparmor.d/abstractions/dovecot-common b/profiles/apparmor.d/abstractions/dovecot-common index 35d3cb11a..d0722eb14 100644 --- a/profiles/apparmor.d/abstractions/dovecot-common +++ b/profiles/apparmor.d/abstractions/dovecot-common @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # used with dovecot/* - abi , + abi , capability setgid, diff --git a/profiles/apparmor.d/abstractions/dri-common b/profiles/apparmor.d/abstractions/dri-common index cd9542b0b..fb82b8d36 100644 --- a/profiles/apparmor.d/abstractions/dri-common +++ b/profiles/apparmor.d/abstractions/dri-common @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This file contains common DRI-specific rules useful for GUI applications # (needed by libdrm and similar). diff --git a/profiles/apparmor.d/abstractions/dri-enumerate b/profiles/apparmor.d/abstractions/dri-enumerate index b5717cd21..4774cee1e 100644 --- a/profiles/apparmor.d/abstractions/dri-enumerate +++ b/profiles/apparmor.d/abstractions/dri-enumerate @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This file contains common DRI-specific rules useful for GUI applications that # needs to enumerate graphic devices (as with drmParsePciDeviceInfo() from diff --git a/profiles/apparmor.d/abstractions/enchant b/profiles/apparmor.d/abstractions/enchant index e80373b2c..ecfbe0e33 100644 --- a/profiles/apparmor.d/abstractions/enchant +++ b/profiles/apparmor.d/abstractions/enchant @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # abstraction for Enchant spellchecking frontend diff --git a/profiles/apparmor.d/abstractions/exo-open b/profiles/apparmor.d/abstractions/exo-open index 0927f2d5f..a6b50c437 100644 --- a/profiles/apparmor.d/abstractions/exo-open +++ b/profiles/apparmor.d/abstractions/exo-open @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This abstraction is designed to be used in a child profile to limit what # confined application can invoke via exo-open helper. diff --git a/profiles/apparmor.d/abstractions/fcitx b/profiles/apparmor.d/abstractions/fcitx index 9321bfcd2..63173a05c 100644 --- a/profiles/apparmor.d/abstractions/fcitx +++ b/profiles/apparmor.d/abstractions/fcitx @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include dbus bus=fcitx, diff --git a/profiles/apparmor.d/abstractions/fcitx-strict b/profiles/apparmor.d/abstractions/fcitx-strict index 19d2191df..9ca0ad6d9 100644 --- a/profiles/apparmor.d/abstractions/fcitx-strict +++ b/profiles/apparmor.d/abstractions/fcitx-strict @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/fonts b/profiles/apparmor.d/abstractions/fonts index 7070a2b86..d86d23089 100644 --- a/profiles/apparmor.d/abstractions/fonts +++ b/profiles/apparmor.d/abstractions/fonts @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /usr/share/AbiSuite/fonts/** r, diff --git a/profiles/apparmor.d/abstractions/freedesktop.org b/profiles/apparmor.d/abstractions/freedesktop.org index 0451559d3..cb5e1ecfb 100644 --- a/profiles/apparmor.d/abstractions/freedesktop.org +++ b/profiles/apparmor.d/abstractions/freedesktop.org @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # system configuration @{system_share_dirs}/applications/{**,} r, diff --git a/profiles/apparmor.d/abstractions/gio-open b/profiles/apparmor.d/abstractions/gio-open index fda1fb9e3..f21171732 100644 --- a/profiles/apparmor.d/abstractions/gio-open +++ b/profiles/apparmor.d/abstractions/gio-open @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This abstraction is designed to be used in a child profile to limit what # confined application can invoke via gio helper. diff --git a/profiles/apparmor.d/abstractions/gnome b/profiles/apparmor.d/abstractions/gnome index 94f3da630..ca2eb394f 100644 --- a/profiles/apparmor.d/abstractions/gnome +++ b/profiles/apparmor.d/abstractions/gnome @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include include diff --git a/profiles/apparmor.d/abstractions/gnupg b/profiles/apparmor.d/abstractions/gnupg index 050f04354..e94f3bc51 100644 --- a/profiles/apparmor.d/abstractions/gnupg +++ b/profiles/apparmor.d/abstractions/gnupg @@ -1,7 +1,7 @@ # vim:syntax=apparmor # gnupg sub-process running permissions - abi , + abi , # user configurations owner @{HOME}/.gnupg/options r, diff --git a/profiles/apparmor.d/abstractions/gtk b/profiles/apparmor.d/abstractions/gtk index 893494f40..99f46edb9 100644 --- a/profiles/apparmor.d/abstractions/gtk +++ b/profiles/apparmor.d/abstractions/gtk @@ -7,7 +7,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /usr/share/themes/{,**} r, diff --git a/profiles/apparmor.d/abstractions/gvfs-open b/profiles/apparmor.d/abstractions/gvfs-open index 32653148a..06b35850d 100644 --- a/profiles/apparmor.d/abstractions/gvfs-open +++ b/profiles/apparmor.d/abstractions/gvfs-open @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This abstraction is designed to be used in a child profile to limit what # confined application can invoke via gvfs-open helper. diff --git a/profiles/apparmor.d/abstractions/hosts_access b/profiles/apparmor.d/abstractions/hosts_access index e5ea88c11..bc4981401 100644 --- a/profiles/apparmor.d/abstractions/hosts_access +++ b/profiles/apparmor.d/abstractions/hosts_access @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /etc/hosts.deny r, /etc/hosts.allow r, diff --git a/profiles/apparmor.d/abstractions/ibus b/profiles/apparmor.d/abstractions/ibus index a8b2bf182..9de24de50 100644 --- a/profiles/apparmor.d/abstractions/ibus +++ b/profiles/apparmor.d/abstractions/ibus @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # abstraction for ibus input methods owner @{HOME}/.config/ibus/ r, diff --git a/profiles/apparmor.d/abstractions/kde b/profiles/apparmor.d/abstractions/kde index f8cb31401..9ba93ce56 100644 --- a/profiles/apparmor.d/abstractions/kde +++ b/profiles/apparmor.d/abstractions/kde @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include include diff --git a/profiles/apparmor.d/abstractions/kde-globals-write b/profiles/apparmor.d/abstractions/kde-globals-write index 5db20a358..b3142d878 100644 --- a/profiles/apparmor.d/abstractions/kde-globals-write +++ b/profiles/apparmor.d/abstractions/kde-globals-write @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Rules for changing KDE settings (for KFileDialog and other). - abi , + abi , # User files diff --git a/profiles/apparmor.d/abstractions/kde-icon-cache-write b/profiles/apparmor.d/abstractions/kde-icon-cache-write index df3793e1a..9f01985a9 100644 --- a/profiles/apparmor.d/abstractions/kde-icon-cache-write +++ b/profiles/apparmor.d/abstractions/kde-icon-cache-write @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Rules for writing KDE icon cache - abi , + abi , # User files diff --git a/profiles/apparmor.d/abstractions/kde-language-write b/profiles/apparmor.d/abstractions/kde-language-write index 1314d21c6..ad124b775 100644 --- a/profiles/apparmor.d/abstractions/kde-language-write +++ b/profiles/apparmor.d/abstractions/kde-language-write @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # Rules for changing per-application language settings on KDE. Some KDE # applications have "Help -> Switch Application Language..." option, that needs diff --git a/profiles/apparmor.d/abstractions/kde-open5 b/profiles/apparmor.d/abstractions/kde-open5 index d3adae298..026c29373 100644 --- a/profiles/apparmor.d/abstractions/kde-open5 +++ b/profiles/apparmor.d/abstractions/kde-open5 @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This abstraction is designed to be used in a child profile to limit what # confined application can invoke via kde-open5 helper. diff --git a/profiles/apparmor.d/abstractions/kerberosclient b/profiles/apparmor.d/abstractions/kerberosclient index a4452c21e..e5f3a934f 100644 --- a/profiles/apparmor.d/abstractions/kerberosclient +++ b/profiles/apparmor.d/abstractions/kerberosclient @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # files required by kerberos client programs /usr/lib{,32,64}/krb5/plugins/libkrb5/ r, diff --git a/profiles/apparmor.d/abstractions/ldapclient b/profiles/apparmor.d/abstractions/ldapclient index 550963c43..ecc403f6d 100644 --- a/profiles/apparmor.d/abstractions/ldapclient +++ b/profiles/apparmor.d/abstractions/ldapclient @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # files required by LDAP clients (e.g. nss_ldap/pam_ldap) /etc/ldap.conf r, diff --git a/profiles/apparmor.d/abstractions/libpam-systemd b/profiles/apparmor.d/abstractions/libpam-systemd index b99765f98..5d69abe21 100644 --- a/profiles/apparmor.d/abstractions/libpam-systemd +++ b/profiles/apparmor.d/abstractions/libpam-systemd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/likewise b/profiles/apparmor.d/abstractions/likewise index 3cf9c92c6..1985f368c 100644 --- a/profiles/apparmor.d/abstractions/likewise +++ b/profiles/apparmor.d/abstractions/likewise @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /tmp/.lwidentity/pipe rw, /var/lib/likewise-open/lwidentity_privileged/pipe rw, diff --git a/profiles/apparmor.d/abstractions/mdns b/profiles/apparmor.d/abstractions/mdns index 0e4a5dc01..5024b7a52 100644 --- a/profiles/apparmor.d/abstractions/mdns +++ b/profiles/apparmor.d/abstractions/mdns @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # mdnsd /etc/mdns.allow r, diff --git a/profiles/apparmor.d/abstractions/mesa b/profiles/apparmor.d/abstractions/mesa index 381c12f60..ecabc20ec 100644 --- a/profiles/apparmor.d/abstractions/mesa +++ b/profiles/apparmor.d/abstractions/mesa @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Rules for Mesa implementation of the OpenGL API - abi , + abi , # System files /dev/dri/ r, # libGLX_mesa.so calls drmGetDevice2() diff --git a/profiles/apparmor.d/abstractions/mir b/profiles/apparmor.d/abstractions/mir index 4ccc22ee9..85ebde716 100644 --- a/profiles/apparmor.d/abstractions/mir +++ b/profiles/apparmor.d/abstractions/mir @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # mir libraries sometimes do not have a lib prefix # see LP: #1422521 diff --git a/profiles/apparmor.d/abstractions/mozc b/profiles/apparmor.d/abstractions/mozc index e7480c2e6..6ca1a84d9 100644 --- a/profiles/apparmor.d/abstractions/mozc +++ b/profiles/apparmor.d/abstractions/mozc @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , unix (connect, receive, send) type=stream peer=(addr="@tmp/.mozc.*"), diff --git a/profiles/apparmor.d/abstractions/mysql b/profiles/apparmor.d/abstractions/mysql index 4feccb44b..5643953e7 100644 --- a/profiles/apparmor.d/abstractions/mysql +++ b/profiles/apparmor.d/abstractions/mysql @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /var/lib/mysql{,d}/mysql{,d}.sock rw, @{run}/mysql{,d}/mysql{,d}.sock rw, diff --git a/profiles/apparmor.d/abstractions/nameservice b/profiles/apparmor.d/abstractions/nameservice index 7f53f2eb6..d8fe6bc39 100644 --- a/profiles/apparmor.d/abstractions/nameservice +++ b/profiles/apparmor.d/abstractions/nameservice @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # Many programs wish to perform nameservice-like operations, such as # looking up users by name or id, groups by name or id, hosts by name diff --git a/profiles/apparmor.d/abstractions/nis b/profiles/apparmor.d/abstractions/nis index 1aea3f14d..70c426b30 100644 --- a/profiles/apparmor.d/abstractions/nis +++ b/profiles/apparmor.d/abstractions/nis @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # NIS rules /var/yp/binding/* r, diff --git a/profiles/apparmor.d/abstractions/nss-systemd b/profiles/apparmor.d/abstractions/nss-systemd index 7116fdf1e..0d2683c88 100644 --- a/profiles/apparmor.d/abstractions/nss-systemd +++ b/profiles/apparmor.d/abstractions/nss-systemd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # libnss-systemd # diff --git a/profiles/apparmor.d/abstractions/nvidia b/profiles/apparmor.d/abstractions/nvidia index 0c57921d8..fb1ffafd2 100644 --- a/profiles/apparmor.d/abstractions/nvidia +++ b/profiles/apparmor.d/abstractions/nvidia @@ -1,7 +1,7 @@ # vim:syntax=apparmor # nvidia access requirements - abi , + abi , # configuration queries capability ipc_lock, diff --git a/profiles/apparmor.d/abstractions/opencl b/profiles/apparmor.d/abstractions/opencl index 58b353238..6dc3c5a09 100644 --- a/profiles/apparmor.d/abstractions/opencl +++ b/profiles/apparmor.d/abstractions/opencl @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # OpenCL access requirements diff --git a/profiles/apparmor.d/abstractions/opencl-common b/profiles/apparmor.d/abstractions/opencl-common index a80b4ba2c..52b40d358 100644 --- a/profiles/apparmor.d/abstractions/opencl-common +++ b/profiles/apparmor.d/abstractions/opencl-common @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # implementation-independent OpenCL access requirements diff --git a/profiles/apparmor.d/abstractions/opencl-intel b/profiles/apparmor.d/abstractions/opencl-intel index 4d0472330..b584af27c 100644 --- a/profiles/apparmor.d/abstractions/opencl-intel +++ b/profiles/apparmor.d/abstractions/opencl-intel @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # OpenCL access requirements for Intel implementation diff --git a/profiles/apparmor.d/abstractions/opencl-mesa b/profiles/apparmor.d/abstractions/opencl-mesa index a5cada614..35792770a 100644 --- a/profiles/apparmor.d/abstractions/opencl-mesa +++ b/profiles/apparmor.d/abstractions/opencl-mesa @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # OpenCL access requirements for Mesa implementation diff --git a/profiles/apparmor.d/abstractions/opencl-nvidia b/profiles/apparmor.d/abstractions/opencl-nvidia index bbd432b14..5ad69b3ff 100644 --- a/profiles/apparmor.d/abstractions/opencl-nvidia +++ b/profiles/apparmor.d/abstractions/opencl-nvidia @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # OpenCL access requirements for NVIDIA implementation diff --git a/profiles/apparmor.d/abstractions/opencl-pocl b/profiles/apparmor.d/abstractions/opencl-pocl index 8b93b0dc3..c69e7e6e1 100644 --- a/profiles/apparmor.d/abstractions/opencl-pocl +++ b/profiles/apparmor.d/abstractions/opencl-pocl @@ -1,7 +1,7 @@ # vim:syntax=apparmor # OpenCL access requirements for POCL implementation - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/openssl b/profiles/apparmor.d/abstractions/openssl index 65939ae44..b680e892e 100644 --- a/profiles/apparmor.d/abstractions/openssl +++ b/profiles/apparmor.d/abstractions/openssl @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /etc/ssl/openssl.cnf r, /etc/ssl/openssl-*.cnf r, diff --git a/profiles/apparmor.d/abstractions/orbit2 b/profiles/apparmor.d/abstractions/orbit2 index 6e27461f5..20e6b6f42 100644 --- a/profiles/apparmor.d/abstractions/orbit2 +++ b/profiles/apparmor.d/abstractions/orbit2 @@ -1,7 +1,7 @@ # vim:syntax=apparmor # orbit2 permissions - abi , + abi , # system library /usr/lib/orbit-2.0/*.so mr, diff --git a/profiles/apparmor.d/abstractions/p11-kit b/profiles/apparmor.d/abstractions/p11-kit index 29696815e..57b8f886a 100644 --- a/profiles/apparmor.d/abstractions/p11-kit +++ b/profiles/apparmor.d/abstractions/p11-kit @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /etc/pkcs11/ r, /etc/pkcs11/pkcs11.conf r, diff --git a/profiles/apparmor.d/abstractions/perl b/profiles/apparmor.d/abstractions/perl index 39718535a..d69fc54d1 100644 --- a/profiles/apparmor.d/abstractions/perl +++ b/profiles/apparmor.d/abstractions/perl @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # a few files typically required for perl scripts /usr/bin/perl rmix, diff --git a/profiles/apparmor.d/abstractions/php b/profiles/apparmor.d/abstractions/php index 6bf0dc798..ac760bc9e 100644 --- a/profiles/apparmor.d/abstractions/php +++ b/profiles/apparmor.d/abstractions/php @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # shared snippets for config files /etc/php{,5,7,8}/** r, diff --git a/profiles/apparmor.d/abstractions/php-worker b/profiles/apparmor.d/abstractions/php-worker index a476e4071..40f63adb5 100644 --- a/profiles/apparmor.d/abstractions/php-worker +++ b/profiles/apparmor.d/abstractions/php-worker @@ -2,7 +2,7 @@ # This file contains basic permissions for php-fpm workers - abi , + abi , # load common libraries and their support files include diff --git a/profiles/apparmor.d/abstractions/php5 b/profiles/apparmor.d/abstractions/php5 index 25f8001e8..222968c88 100644 --- a/profiles/apparmor.d/abstractions/php5 +++ b/profiles/apparmor.d/abstractions/php5 @@ -1,6 +1,6 @@ #backwards compatibility include, actual abstraction moved from php5 to php - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/postfix-common b/profiles/apparmor.d/abstractions/postfix-common index 68d4f7a82..2691de8e4 100644 --- a/profiles/apparmor.d/abstractions/postfix-common +++ b/profiles/apparmor.d/abstractions/postfix-common @@ -11,7 +11,7 @@ # ------------------------------------------------------------------ # used with postfix/* - abi , + abi , capability setuid, diff --git a/profiles/apparmor.d/abstractions/private-files b/profiles/apparmor.d/abstractions/private-files index 5f0504178..00ad5f16d 100644 --- a/profiles/apparmor.d/abstractions/private-files +++ b/profiles/apparmor.d/abstractions/private-files @@ -2,7 +2,7 @@ # privacy-violations contains rules for common files that you want to # explicitly deny access - abi , + abi , # privacy violations (don't audit files under $HOME otherwise get a # lot of false positives when reading contents of directories) diff --git a/profiles/apparmor.d/abstractions/private-files-strict b/profiles/apparmor.d/abstractions/private-files-strict index b8ab40e0c..28d3ab1e8 100644 --- a/profiles/apparmor.d/abstractions/private-files-strict +++ b/profiles/apparmor.d/abstractions/private-files-strict @@ -2,7 +2,7 @@ # privacy-violations-strict contains additional rules for sensitive # files that you want to explicitly deny access - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/python b/profiles/apparmor.d/abstractions/python index cb3cc2884..ce41714a6 100644 --- a/profiles/apparmor.d/abstractions/python +++ b/profiles/apparmor.d/abstractions/python @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /{usr/,}bin/ r, /{usr/,}bin/python{2.[4-7],3,3.[0-9],3.1[0-9]} r, diff --git a/profiles/apparmor.d/abstractions/qt5 b/profiles/apparmor.d/abstractions/qt5 index 83dc00c4e..d9d53ba9e 100644 --- a/profiles/apparmor.d/abstractions/qt5 +++ b/profiles/apparmor.d/abstractions/qt5 @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Common rules for Qt5-based applications - abi , + abi , # Additional libraries diff --git a/profiles/apparmor.d/abstractions/qt5-compose-cache-write b/profiles/apparmor.d/abstractions/qt5-compose-cache-write index 5322ea031..a34178b24 100644 --- a/profiles/apparmor.d/abstractions/qt5-compose-cache-write +++ b/profiles/apparmor.d/abstractions/qt5-compose-cache-write @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Allow writing cache for Qt5 "platforminputcontexts" plugins - abi , + abi , # User files diff --git a/profiles/apparmor.d/abstractions/qt5-settings-write b/profiles/apparmor.d/abstractions/qt5-settings-write index 327390ace..fe592dc35 100644 --- a/profiles/apparmor.d/abstractions/qt5-settings-write +++ b/profiles/apparmor.d/abstractions/qt5-settings-write @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Allow writing shared settings for Qt-based applications - abi , + abi , # User files diff --git a/profiles/apparmor.d/abstractions/recent-documents-write b/profiles/apparmor.d/abstractions/recent-documents-write index 02962e4c7..93c90cab9 100644 --- a/profiles/apparmor.d/abstractions/recent-documents-write +++ b/profiles/apparmor.d/abstractions/recent-documents-write @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Allow updating recent documents - abi , + abi , # User files diff --git a/profiles/apparmor.d/abstractions/ruby b/profiles/apparmor.d/abstractions/ruby index a71a2043b..2f35e6707 100644 --- a/profiles/apparmor.d/abstractions/ruby +++ b/profiles/apparmor.d/abstractions/ruby @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /usr/lib{,32,64}/ruby/1.[89]{.[0-9],}/ r, /usr/lib{,32,64}/ruby/1.[89]{.[0-9],}/**.rb r, diff --git a/profiles/apparmor.d/abstractions/samba b/profiles/apparmor.d/abstractions/samba index a17e31a18..ae2d2e6ed 100644 --- a/profiles/apparmor.d/abstractions/samba +++ b/profiles/apparmor.d/abstractions/samba @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /etc/samba/* r, /usr/lib*/ldb/*.so mr, diff --git a/profiles/apparmor.d/abstractions/samba-rpcd b/profiles/apparmor.d/abstractions/samba-rpcd index 4c83091ad..fca361a17 100644 --- a/profiles/apparmor.d/abstractions/samba-rpcd +++ b/profiles/apparmor.d/abstractions/samba-rpcd @@ -11,7 +11,7 @@ # This file contains basic permissions for samba rpcd_xyz services - abi , + abi , include include diff --git a/profiles/apparmor.d/abstractions/smbpass b/profiles/apparmor.d/abstractions/smbpass index 89534d464..0a7f60d3a 100644 --- a/profiles/apparmor.d/abstractions/smbpass +++ b/profiles/apparmor.d/abstractions/smbpass @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # libpam-smbpass/pam_smbpass.so permissions /var/lib/samba/*.[lt]db rwk, diff --git a/profiles/apparmor.d/abstractions/ssl_certs b/profiles/apparmor.d/abstractions/ssl_certs index edb39646b..3db31fa21 100644 --- a/profiles/apparmor.d/abstractions/ssl_certs +++ b/profiles/apparmor.d/abstractions/ssl_certs @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /etc/ca-certificates/{,**} r, /etc/{,libre}ssl/ r, diff --git a/profiles/apparmor.d/abstractions/ssl_keys b/profiles/apparmor.d/abstractions/ssl_keys index f310bb5a1..21e4727bc 100644 --- a/profiles/apparmor.d/abstractions/ssl_keys +++ b/profiles/apparmor.d/abstractions/ssl_keys @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # private ssl permissions diff --git a/profiles/apparmor.d/abstractions/svn-repositories b/profiles/apparmor.d/abstractions/svn-repositories index ca9f990c2..8a1c7b6ff 100644 --- a/profiles/apparmor.d/abstractions/svn-repositories +++ b/profiles/apparmor.d/abstractions/svn-repositories @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # This little snippet should abstract the read/write access to a repository. # it is intended to be included in profiles for svnserve/apache2 and maybe diff --git a/profiles/apparmor.d/abstractions/trash b/profiles/apparmor.d/abstractions/trash index 68a43c067..96d80ed63 100644 --- a/profiles/apparmor.d/abstractions/trash +++ b/profiles/apparmor.d/abstractions/trash @@ -1,4 +1,4 @@ -abi , +abi , # requires diff --git a/profiles/apparmor.d/abstractions/ubuntu-bittorrent-clients b/profiles/apparmor.d/abstractions/ubuntu-bittorrent-clients index 0d929ad61..36378e49d 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-bittorrent-clients +++ b/profiles/apparmor.d/abstractions/ubuntu-bittorrent-clients @@ -6,7 +6,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/azureus Cxr -> sanitized_helper, /usr/bin/bitstormlite Cxr -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers b/profiles/apparmor.d/abstractions/ubuntu-browsers index c2c710a11..a85203e02 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers @@ -6,7 +6,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/arora Cx -> sanitized_helper, /usr/bin/dillo Cx -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/chromium-browser b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/chromium-browser index 95724f1a4..7c4a3a5fa 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/chromium-browser +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/chromium-browser @@ -13,7 +13,7 @@ # For site-specific adjustments, please see: # /etc/apparmor.d/local/chromium-browser -abi , +abi , include include diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java index 507d62a0a..b9d19d25b 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # Java plugin owner @{HOME}/.java/deployment/deployment.properties k, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/kde b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/kde index bdac331e3..4b4314e27 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/kde +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/kde @@ -3,7 +3,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , include /usr/bin/kde4-config Cx -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/mailto b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/mailto index 8d1570986..c09b501b0 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/mailto +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/mailto @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # for mailto: include diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/multimedia b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/multimedia index f2eb23ef3..37fae7019 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/multimedia +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/multimedia @@ -3,7 +3,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/plugins-common b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/plugins-common index 5d93b262e..b4c4b37e6 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/plugins-common +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/plugins-common @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # # Plugins/helpers diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/productivity b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/productivity index 1fc67a84a..f778ce28f 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/productivity +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/productivity @@ -3,7 +3,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , # Openoffice.org /usr/bin/ooffice Cxr -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/text-editors b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/text-editors index e04c6b80b..6280b4d9d 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/text-editors +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/text-editors @@ -3,7 +3,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , # Text editors (It's All Text [https://addons.mozilla.org/en-US/firefox/addon/4125]) /usr/bin/emacsclient.emacs-snapshot Cxr -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration index cdbd47cd3..8e73ec2d4 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration @@ -3,7 +3,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , # Apport /usr/bin/apport-bug Cx -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration-xul b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration-xul index c6a8eeddd..c1e4f7a74 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration-xul +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration-xul @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # firefox-notify include diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files index f04545528..fa731520d 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # Allow read to all files user has DAC access to and write access to all # files owned by the user in $HOME. diff --git a/profiles/apparmor.d/abstractions/ubuntu-console-browsers b/profiles/apparmor.d/abstractions/ubuntu-console-browsers index 8f6687ae1..f05585894 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-console-browsers +++ b/profiles/apparmor.d/abstractions/ubuntu-console-browsers @@ -10,7 +10,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/elinks Cx -> sanitized_helper, /usr/bin/links Cx -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-console-email b/profiles/apparmor.d/abstractions/ubuntu-console-email index ee741fdfd..dee7feed9 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-console-email +++ b/profiles/apparmor.d/abstractions/ubuntu-console-email @@ -10,7 +10,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/alpine Cx -> sanitized_helper, /usr/bin/citadel Cx -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-email b/profiles/apparmor.d/abstractions/ubuntu-email index 45f02eba2..6ebc26e1b 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-email +++ b/profiles/apparmor.d/abstractions/ubuntu-email @@ -6,7 +6,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/anjal Cx -> sanitized_helper, /usr/bin/balsa Cx -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-feed-readers b/profiles/apparmor.d/abstractions/ubuntu-feed-readers index e8b89b1d3..9e2e116da 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-feed-readers +++ b/profiles/apparmor.d/abstractions/ubuntu-feed-readers @@ -6,7 +6,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/akregator Cxr -> sanitized_helper, /usr/bin/liferea-add-feed Cxr -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-gnome-terminal b/profiles/apparmor.d/abstractions/ubuntu-gnome-terminal index c6280b0ef..46318f44a 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-gnome-terminal +++ b/profiles/apparmor.d/abstractions/ubuntu-gnome-terminal @@ -3,7 +3,7 @@ # for allowing access to gnome-terminal # - abi , + abi , include diff --git a/profiles/apparmor.d/abstractions/ubuntu-helpers b/profiles/apparmor.d/abstractions/ubuntu-helpers index 8484a411b..d561436ec 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-helpers +++ b/profiles/apparmor.d/abstractions/ubuntu-helpers @@ -31,7 +31,7 @@ # Use at your own risk. This profile was developed as an interim workaround for # LP: #851986 until AppArmor utilizes proper environment filtering. - abi , + abi , profile sanitized_helper { include diff --git a/profiles/apparmor.d/abstractions/ubuntu-konsole b/profiles/apparmor.d/abstractions/ubuntu-konsole index 4ece2bd37..2a40e3817 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-konsole +++ b/profiles/apparmor.d/abstractions/ubuntu-konsole @@ -3,7 +3,7 @@ # for allowing access to konsole # - abi , + abi , include include diff --git a/profiles/apparmor.d/abstractions/ubuntu-media-players b/profiles/apparmor.d/abstractions/ubuntu-media-players index 5fa48e75b..86ec80ab5 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-media-players +++ b/profiles/apparmor.d/abstractions/ubuntu-media-players @@ -6,7 +6,7 @@ # in the toplevel profile. Eg: # include - abi , + abi , /usr/bin/amarok Cxr -> sanitized_helper, /usr/bin/audacious2 Cxr -> sanitized_helper, diff --git a/profiles/apparmor.d/abstractions/ubuntu-unity7-base b/profiles/apparmor.d/abstractions/ubuntu-unity7-base index 6e207b287..c8305d879 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-unity7-base +++ b/profiles/apparmor.d/abstractions/ubuntu-unity7-base @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # # Rules common to applications running under Unity 7 diff --git a/profiles/apparmor.d/abstractions/ubuntu-unity7-launcher b/profiles/apparmor.d/abstractions/ubuntu-unity7-launcher index eb2f070d3..d73edfc8f 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-unity7-launcher +++ b/profiles/apparmor.d/abstractions/ubuntu-unity7-launcher @@ -1,4 +1,4 @@ - abi , + abi , # # Access required for connecting to/communicating with the Unity Launcher diff --git a/profiles/apparmor.d/abstractions/ubuntu-unity7-messaging b/profiles/apparmor.d/abstractions/ubuntu-unity7-messaging index 21de3ff0d..7e2ff3aa8 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-unity7-messaging +++ b/profiles/apparmor.d/abstractions/ubuntu-unity7-messaging @@ -1,4 +1,4 @@ - abi , + abi , # # Access required for connecting to/communicating with the Unity messaging diff --git a/profiles/apparmor.d/abstractions/ubuntu-xterm b/profiles/apparmor.d/abstractions/ubuntu-xterm index 07eacaba9..932f85a41 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-xterm +++ b/profiles/apparmor.d/abstractions/ubuntu-xterm @@ -3,7 +3,7 @@ # for allowing access to xterm # - abi , + abi , include /dev/ptmx rw, diff --git a/profiles/apparmor.d/abstractions/user-download b/profiles/apparmor.d/abstractions/user-download index 765402947..0f8e30af2 100644 --- a/profiles/apparmor.d/abstractions/user-download +++ b/profiles/apparmor.d/abstractions/user-download @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # Description: Where common programs should allow users to download # files diff --git a/profiles/apparmor.d/abstractions/user-mail b/profiles/apparmor.d/abstractions/user-mail index 4156dfaac..366c7b22a 100644 --- a/profiles/apparmor.d/abstractions/user-mail +++ b/profiles/apparmor.d/abstractions/user-mail @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # location of user mail, spool and mboxes owner @{HOME}/[mM]ail/ r, diff --git a/profiles/apparmor.d/abstractions/user-manpages b/profiles/apparmor.d/abstractions/user-manpages index 3178a4d60..66a401333 100644 --- a/profiles/apparmor.d/abstractions/user-manpages +++ b/profiles/apparmor.d/abstractions/user-manpages @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # perhaps your configuration has users elsewhere, or you don't wish # them to read their own manpages diff --git a/profiles/apparmor.d/abstractions/user-tmp b/profiles/apparmor.d/abstractions/user-tmp index 6d651c5dc..804135fa3 100644 --- a/profiles/apparmor.d/abstractions/user-tmp +++ b/profiles/apparmor.d/abstractions/user-tmp @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # per-user tmp directories owner @{HOME}/tmp/** rwkl, diff --git a/profiles/apparmor.d/abstractions/user-write b/profiles/apparmor.d/abstractions/user-write index 604b60b7a..b94ce170f 100644 --- a/profiles/apparmor.d/abstractions/user-write +++ b/profiles/apparmor.d/abstractions/user-write @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # per-user write directories owner @{HOME}/ r, diff --git a/profiles/apparmor.d/abstractions/video b/profiles/apparmor.d/abstractions/video index 2b5634824..0495388d8 100644 --- a/profiles/apparmor.d/abstractions/video +++ b/profiles/apparmor.d/abstractions/video @@ -1,7 +1,7 @@ # vim:syntax=apparmor # video device access - abi , + abi , # System devices @{sys}/class/video4linux/ r, diff --git a/profiles/apparmor.d/abstractions/vulkan b/profiles/apparmor.d/abstractions/vulkan index 2f4a6fc54..aede3757c 100644 --- a/profiles/apparmor.d/abstractions/vulkan +++ b/profiles/apparmor.d/abstractions/vulkan @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Vulkan access requirements - abi , + abi , # System files /dev/dri/ r, # libvulkan_radeon.so, libvulkan_intel.so (Mesa) diff --git a/profiles/apparmor.d/abstractions/wayland b/profiles/apparmor.d/abstractions/wayland index 368e2f77c..27563d5cf 100644 --- a/profiles/apparmor.d/abstractions/wayland +++ b/profiles/apparmor.d/abstractions/wayland @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , owner @{run}/user/*/wayland-[0-9]* rw, owner @{run}/user/*/{mesa,mutter,sdl,wayland-cursor,weston,xwayland}-shared-* rw, diff --git a/profiles/apparmor.d/abstractions/web-data b/profiles/apparmor.d/abstractions/web-data index 8459eee35..f7849b843 100644 --- a/profiles/apparmor.d/abstractions/web-data +++ b/profiles/apparmor.d/abstractions/web-data @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /srv/www/htdocs/ r, /srv/www/htdocs/** r, diff --git a/profiles/apparmor.d/abstractions/winbind b/profiles/apparmor.d/abstractions/winbind index 3503e5a00..9b5b9ab3e 100644 --- a/profiles/apparmor.d/abstractions/winbind +++ b/profiles/apparmor.d/abstractions/winbind @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # pam_winbindd /tmp/.winbindd/pipe rw, diff --git a/profiles/apparmor.d/abstractions/wutmp b/profiles/apparmor.d/abstractions/wutmp index 46d33f795..a12c85bfd 100644 --- a/profiles/apparmor.d/abstractions/wutmp +++ b/profiles/apparmor.d/abstractions/wutmp @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # some services update wtmp, utmp, and lastlog with per-user # connection information diff --git a/profiles/apparmor.d/abstractions/xad b/profiles/apparmor.d/abstractions/xad index f5f6e7204..5969f2c7c 100644 --- a/profiles/apparmor.d/abstractions/xad +++ b/profiles/apparmor.d/abstractions/xad @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , /opt/novell/xad/lib/ r, /opt/novell/xad/lib/lib*.so* mr, diff --git a/profiles/apparmor.d/abstractions/xdg-desktop b/profiles/apparmor.d/abstractions/xdg-desktop index 9f7f4ae2a..19c3e6257 100644 --- a/profiles/apparmor.d/abstractions/xdg-desktop +++ b/profiles/apparmor.d/abstractions/xdg-desktop @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , # Entries based on: # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html diff --git a/profiles/apparmor.d/abstractions/xdg-open b/profiles/apparmor.d/abstractions/xdg-open index 11cf41053..5e539e1de 100644 --- a/profiles/apparmor.d/abstractions/xdg-open +++ b/profiles/apparmor.d/abstractions/xdg-open @@ -1,6 +1,6 @@ # vim:syntax=apparmor - abi , + abi , # This abstraction is designed to be used in a child profile to limit what # confined application can invoke via xdg-open helper. xdg-open abstraction diff --git a/profiles/apparmor.d/apache2.d/phpsysinfo b/profiles/apparmor.d/apache2.d/phpsysinfo index afd1ff340..087b064a9 100644 --- a/profiles/apparmor.d/apache2.d/phpsysinfo +++ b/profiles/apparmor.d/apache2.d/phpsysinfo @@ -1,7 +1,7 @@ # Last Modified: Fri Sep 11 13:27:22 2009 # Author: Marc Deslauriers - abi , + abi , ^phpsysinfo { include diff --git a/profiles/apparmor.d/bin.ping b/profiles/apparmor.d/bin.ping index 149b802d6..238f93c59 100644 --- a/profiles/apparmor.d/bin.ping +++ b/profiles/apparmor.d/bin.ping @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include profile ping /{usr/,}bin/{,iputils-}ping { diff --git a/profiles/apparmor.d/lsb_release b/profiles/apparmor.d/lsb_release index 421a52f7e..a3285bbe7 100644 --- a/profiles/apparmor.d/lsb_release +++ b/profiles/apparmor.d/lsb_release @@ -4,7 +4,7 @@ # is invoked from other confined applications, but not when it is used # in regular (unconfined) shell scripts or run directly by the user. -abi , +abi , include diff --git a/profiles/apparmor.d/nvidia_modprobe b/profiles/apparmor.d/nvidia_modprobe index 558f48207..c9642fdca 100644 --- a/profiles/apparmor.d/nvidia_modprobe +++ b/profiles/apparmor.d/nvidia_modprobe @@ -1,6 +1,6 @@ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/php-fpm b/profiles/apparmor.d/php-fpm index 0dcc8c7df..ee103c521 100644 --- a/profiles/apparmor.d/php-fpm +++ b/profiles/apparmor.d/php-fpm @@ -1,6 +1,6 @@ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/samba-bgqd b/profiles/apparmor.d/samba-bgqd index a63021328..874abcf17 100644 --- a/profiles/apparmor.d/samba-bgqd +++ b/profiles/apparmor.d/samba-bgqd @@ -1,4 +1,4 @@ -abi , +abi , include diff --git a/profiles/apparmor.d/samba-dcerpcd b/profiles/apparmor.d/samba-dcerpcd index 12ea0f557..a455e2c5b 100644 --- a/profiles/apparmor.d/samba-dcerpcd +++ b/profiles/apparmor.d/samba-dcerpcd @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/samba-rpcd b/profiles/apparmor.d/samba-rpcd index 76bc3662a..ec0ed1d7b 100644 --- a/profiles/apparmor.d/samba-rpcd +++ b/profiles/apparmor.d/samba-rpcd @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/samba-rpcd-classic b/profiles/apparmor.d/samba-rpcd-classic index 84a61f312..1a22f8a8f 100644 --- a/profiles/apparmor.d/samba-rpcd-classic +++ b/profiles/apparmor.d/samba-rpcd-classic @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/samba-rpcd-spoolss b/profiles/apparmor.d/samba-rpcd-spoolss index 904fa0196..eda65fa9a 100644 --- a/profiles/apparmor.d/samba-rpcd-spoolss +++ b/profiles/apparmor.d/samba-rpcd-spoolss @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/sbin.klogd b/profiles/apparmor.d/sbin.klogd index cd0cfbb20..918a38e52 100644 --- a/profiles/apparmor.d/sbin.klogd +++ b/profiles/apparmor.d/sbin.klogd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor.d/sbin.syslog-ng b/profiles/apparmor.d/sbin.syslog-ng index 5ae85875b..c1d3b101f 100644 --- a/profiles/apparmor.d/sbin.syslog-ng +++ b/profiles/apparmor.d/sbin.syslog-ng @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor.d/sbin.syslogd b/profiles/apparmor.d/sbin.syslogd index 33c0e7ce4..847c0c1a6 100644 --- a/profiles/apparmor.d/sbin.syslogd +++ b/profiles/apparmor.d/sbin.syslogd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 b/profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 index 7126bdc76..fdc1f40e5 100644 --- a/profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 +++ b/profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 @@ -1,6 +1,6 @@ # Author: Marc Deslauriers -abi , +abi , include /usr/lib/apache2/mpm-prefork/apache2 { diff --git a/profiles/apparmor.d/usr.lib.dovecot.anvil b/profiles/apparmor.d/usr.lib.dovecot.anvil index ac78bc9da..20ff53e96 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.anvil +++ b/profiles/apparmor.d/usr.lib.dovecot.anvil @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.auth b/profiles/apparmor.d/usr.lib.dovecot.auth index 9a53247b3..9ee267607 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.auth +++ b/profiles/apparmor.d/usr.lib.dovecot.auth @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.config b/profiles/apparmor.d/usr.lib.dovecot.config index 94ddfdb18..aedc81ed4 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.config +++ b/profiles/apparmor.d/usr.lib.dovecot.config @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.deliver b/profiles/apparmor.d/usr.lib.dovecot.deliver index 2df23a0f8..345605642 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.deliver +++ b/profiles/apparmor.d/usr.lib.dovecot.deliver @@ -11,7 +11,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.lib.dovecot.dict b/profiles/apparmor.d/usr.lib.dovecot.dict index d0edd88e0..aaa951d41 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.dict +++ b/profiles/apparmor.d/usr.lib.dovecot.dict @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth b/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth index 779bcce23..164989e87 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth +++ b/profiles/apparmor.d/usr.lib.dovecot.dovecot-auth @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda b/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda index c9d3fe4b1..2d632294a 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda +++ b/profiles/apparmor.d/usr.lib.dovecot.dovecot-lda @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.lib.dovecot.imap b/profiles/apparmor.d/usr.lib.dovecot.imap index 8ee2d5a4e..aea3fc0b0 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.imap +++ b/profiles/apparmor.d/usr.lib.dovecot.imap @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.lib.dovecot.imap-login b/profiles/apparmor.d/usr.lib.dovecot.imap-login index fccde842e..4904477b5 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.imap-login +++ b/profiles/apparmor.d/usr.lib.dovecot.imap-login @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.lmtp b/profiles/apparmor.d/usr.lib.dovecot.lmtp index ad26eff3e..033d239fd 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.lmtp +++ b/profiles/apparmor.d/usr.lib.dovecot.lmtp @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.lib.dovecot.log b/profiles/apparmor.d/usr.lib.dovecot.log index 1cc1224b2..86dac62b4 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.log +++ b/profiles/apparmor.d/usr.lib.dovecot.log @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.managesieve b/profiles/apparmor.d/usr.lib.dovecot.managesieve index beaa66edf..90554a20e 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.managesieve +++ b/profiles/apparmor.d/usr.lib.dovecot.managesieve @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.lib.dovecot.managesieve-login b/profiles/apparmor.d/usr.lib.dovecot.managesieve-login index 518157814..de801394d 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.managesieve-login +++ b/profiles/apparmor.d/usr.lib.dovecot.managesieve-login @@ -12,7 +12,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.pop3 b/profiles/apparmor.d/usr.lib.dovecot.pop3 index ed010ddaf..bbf91ffac 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.pop3 +++ b/profiles/apparmor.d/usr.lib.dovecot.pop3 @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.lib.dovecot.pop3-login b/profiles/apparmor.d/usr.lib.dovecot.pop3-login index 2bcc3fec4..ed6145228 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.pop3-login +++ b/profiles/apparmor.d/usr.lib.dovecot.pop3-login @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.script-login b/profiles/apparmor.d/usr.lib.dovecot.script-login index aca227581..39119baea 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.script-login +++ b/profiles/apparmor.d/usr.lib.dovecot.script-login @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.ssl-params b/profiles/apparmor.d/usr.lib.dovecot.ssl-params index 64a1eba80..893d7a303 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.ssl-params +++ b/profiles/apparmor.d/usr.lib.dovecot.ssl-params @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.lib.dovecot.stats b/profiles/apparmor.d/usr.lib.dovecot.stats index 37e774065..f77a25bad 100644 --- a/profiles/apparmor.d/usr.lib.dovecot.stats +++ b/profiles/apparmor.d/usr.lib.dovecot.stats @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.apache2 b/profiles/apparmor.d/usr.sbin.apache2 index 6c9ae7b41..17841715c 100644 --- a/profiles/apparmor.d/usr.sbin.apache2 +++ b/profiles/apparmor.d/usr.sbin.apache2 @@ -1,6 +1,6 @@ # Author: Marc Deslauriers -abi , +abi , include profile apache2 /usr/{bin,sbin}/apache2 flags=(attach_disconnected) { diff --git a/profiles/apparmor.d/usr.sbin.avahi-daemon b/profiles/apparmor.d/usr.sbin.avahi-daemon index af31aec49..fe713efde 100644 --- a/profiles/apparmor.d/usr.sbin.avahi-daemon +++ b/profiles/apparmor.d/usr.sbin.avahi-daemon @@ -1,4 +1,4 @@ -abi , +abi , include profile avahi-daemon /usr/{bin,sbin}/avahi-daemon flags=(attach_disconnected) { diff --git a/profiles/apparmor.d/usr.sbin.dnsmasq b/profiles/apparmor.d/usr.sbin.dnsmasq index dbea29bc9..f0cc01373 100644 --- a/profiles/apparmor.d/usr.sbin.dnsmasq +++ b/profiles/apparmor.d/usr.sbin.dnsmasq @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , @{TFTP_DIR}=/var/tftp /srv/tftp /srv/tftpboot diff --git a/profiles/apparmor.d/usr.sbin.dovecot b/profiles/apparmor.d/usr.sbin.dovecot index 7391049d2..f6605e16b 100644 --- a/profiles/apparmor.d/usr.sbin.dovecot +++ b/profiles/apparmor.d/usr.sbin.dovecot @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim: ft=apparmor -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.identd b/profiles/apparmor.d/usr.sbin.identd index 8dc869dc0..f4f7d580c 100644 --- a/profiles/apparmor.d/usr.sbin.identd +++ b/profiles/apparmor.d/usr.sbin.identd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.mdnsd b/profiles/apparmor.d/usr.sbin.mdnsd index af934cbf6..ff093bb71 100644 --- a/profiles/apparmor.d/usr.sbin.mdnsd +++ b/profiles/apparmor.d/usr.sbin.mdnsd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.nmbd b/profiles/apparmor.d/usr.sbin.nmbd index 41b4ad2e7..754c37b63 100644 --- a/profiles/apparmor.d/usr.sbin.nmbd +++ b/profiles/apparmor.d/usr.sbin.nmbd @@ -1,4 +1,4 @@ -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.nscd b/profiles/apparmor.d/usr.sbin.nscd index 4b7b3b9a2..34aa13fc6 100644 --- a/profiles/apparmor.d/usr.sbin.nscd +++ b/profiles/apparmor.d/usr.sbin.nscd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include profile nscd /usr/{bin,sbin}/nscd { diff --git a/profiles/apparmor.d/usr.sbin.ntpd b/profiles/apparmor.d/usr.sbin.ntpd index 062adf4d6..1e980fb01 100644 --- a/profiles/apparmor.d/usr.sbin.ntpd +++ b/profiles/apparmor.d/usr.sbin.ntpd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include include diff --git a/profiles/apparmor.d/usr.sbin.smbd b/profiles/apparmor.d/usr.sbin.smbd index c4e6d70c7..059f0e732 100644 --- a/profiles/apparmor.d/usr.sbin.smbd +++ b/profiles/apparmor.d/usr.sbin.smbd @@ -1,4 +1,4 @@ -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.smbldap-useradd b/profiles/apparmor.d/usr.sbin.smbldap-useradd index c89f9d7b6..395656210 100644 --- a/profiles/apparmor.d/usr.sbin.smbldap-useradd +++ b/profiles/apparmor.d/usr.sbin.smbldap-useradd @@ -1,6 +1,6 @@ # Last Modified: Tue Jan 3 00:17:40 2012 -abi , +abi , include diff --git a/profiles/apparmor.d/usr.sbin.traceroute b/profiles/apparmor.d/usr.sbin.traceroute index 926ccdafe..d3c885b29 100644 --- a/profiles/apparmor.d/usr.sbin.traceroute +++ b/profiles/apparmor.d/usr.sbin.traceroute @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include profile traceroute /usr/{{bin,sbin}/traceroute,bin/linux-traceroute,bin/traceroute.db} { diff --git a/profiles/apparmor.d/usr.sbin.winbindd b/profiles/apparmor.d/usr.sbin.winbindd index 5b3c2ca6e..9283dfa15 100644 --- a/profiles/apparmor.d/usr.sbin.winbindd +++ b/profiles/apparmor.d/usr.sbin.winbindd @@ -1,4 +1,4 @@ -abi , +abi , include diff --git a/profiles/apparmor.d/zgrep b/profiles/apparmor.d/zgrep index ed342b20d..533b3d4a7 100644 --- a/profiles/apparmor.d/zgrep +++ b/profiles/apparmor.d/zgrep @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/bin.netstat b/profiles/apparmor/profiles/extras/bin.netstat index 41ab5e6c9..a2156cd78 100644 --- a/profiles/apparmor/profiles/extras/bin.netstat +++ b/profiles/apparmor/profiles/extras/bin.netstat @@ -13,7 +13,7 @@ # give evolution access to significant chunks of /proc # - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/chromium_browser b/profiles/apparmor/profiles/extras/chromium_browser index 37ba2c5f6..2839c0236 100644 --- a/profiles/apparmor/profiles/extras/chromium_browser +++ b/profiles/apparmor/profiles/extras/chromium_browser @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # Author: Jamie Strandboge -abi , +abi , #include diff --git a/profiles/apparmor/profiles/extras/etc.cron.daily.logrotate b/profiles/apparmor/profiles/extras/etc.cron.daily.logrotate index 079c8c11a..a5c4f3e42 100644 --- a/profiles/apparmor/profiles/extras/etc.cron.daily.logrotate +++ b/profiles/apparmor/profiles/extras/etc.cron.daily.logrotate @@ -11,7 +11,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/etc.cron.daily.slocate.cron b/profiles/apparmor/profiles/extras/etc.cron.daily.slocate.cron index de731c44f..0131fbb30 100644 --- a/profiles/apparmor/profiles/extras/etc.cron.daily.slocate.cron +++ b/profiles/apparmor/profiles/extras/etc.cron.daily.slocate.cron @@ -12,7 +12,7 @@ # that it can traverse the whole filesystem. # - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/etc.cron.daily.tmpwatch b/profiles/apparmor/profiles/extras/etc.cron.daily.tmpwatch index ee4e5c673..833c0cca5 100644 --- a/profiles/apparmor/profiles/extras/etc.cron.daily.tmpwatch +++ b/profiles/apparmor/profiles/extras/etc.cron.daily.tmpwatch @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/firefox b/profiles/apparmor/profiles/extras/firefox index ad0173e14..956dbff6b 100644 --- a/profiles/apparmor/profiles/extras/firefox +++ b/profiles/apparmor/profiles/extras/firefox @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/firefox.sh b/profiles/apparmor/profiles/extras/firefox.sh index 352fa36cb..fb75c5b64 100644 --- a/profiles/apparmor/profiles/extras/firefox.sh +++ b/profiles/apparmor/profiles/extras/firefox.sh @@ -1,6 +1,6 @@ # Last Modified: Wed Nov 5 03:32:59 2008 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-anvil b/profiles/apparmor/profiles/extras/postfix-anvil index b0b165da3..e198407b8 100644 --- a/profiles/apparmor/profiles/extras/postfix-anvil +++ b/profiles/apparmor/profiles/extras/postfix-anvil @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-bounce b/profiles/apparmor/profiles/extras/postfix-bounce index ffe69461b..fd786da02 100644 --- a/profiles/apparmor/profiles/extras/postfix-bounce +++ b/profiles/apparmor/profiles/extras/postfix-bounce @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-cleanup b/profiles/apparmor/profiles/extras/postfix-cleanup index 6789ae149..6ca33e23e 100644 --- a/profiles/apparmor/profiles/extras/postfix-cleanup +++ b/profiles/apparmor/profiles/extras/postfix-cleanup @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-discard b/profiles/apparmor/profiles/extras/postfix-discard index c236c386a..843202e98 100644 --- a/profiles/apparmor/profiles/extras/postfix-discard +++ b/profiles/apparmor/profiles/extras/postfix-discard @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-dnsblog b/profiles/apparmor/profiles/extras/postfix-dnsblog index 05c6a5f95..df5a01305 100644 --- a/profiles/apparmor/profiles/extras/postfix-dnsblog +++ b/profiles/apparmor/profiles/extras/postfix-dnsblog @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-error b/profiles/apparmor/profiles/extras/postfix-error index 709875515..51ed8d65e 100644 --- a/profiles/apparmor/profiles/extras/postfix-error +++ b/profiles/apparmor/profiles/extras/postfix-error @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-flush b/profiles/apparmor/profiles/extras/postfix-flush index c51478e32..56c6457d1 100644 --- a/profiles/apparmor/profiles/extras/postfix-flush +++ b/profiles/apparmor/profiles/extras/postfix-flush @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-lmtp b/profiles/apparmor/profiles/extras/postfix-lmtp index 9ffbc74bd..85d34f188 100644 --- a/profiles/apparmor/profiles/extras/postfix-lmtp +++ b/profiles/apparmor/profiles/extras/postfix-lmtp @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-local b/profiles/apparmor/profiles/extras/postfix-local index 72b7a5742..7dfa2102f 100644 --- a/profiles/apparmor/profiles/extras/postfix-local +++ b/profiles/apparmor/profiles/extras/postfix-local @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ - abi , + abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-master b/profiles/apparmor/profiles/extras/postfix-master index e06c45506..e2f58d945 100644 --- a/profiles/apparmor/profiles/extras/postfix-master +++ b/profiles/apparmor/profiles/extras/postfix-master @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-nqmgr b/profiles/apparmor/profiles/extras/postfix-nqmgr index 0a2939176..2accf266d 100644 --- a/profiles/apparmor/profiles/extras/postfix-nqmgr +++ b/profiles/apparmor/profiles/extras/postfix-nqmgr @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-oqmgr b/profiles/apparmor/profiles/extras/postfix-oqmgr index 443243c37..cb332cfe9 100644 --- a/profiles/apparmor/profiles/extras/postfix-oqmgr +++ b/profiles/apparmor/profiles/extras/postfix-oqmgr @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-pickup b/profiles/apparmor/profiles/extras/postfix-pickup index 6bd5af916..ec1985cab 100644 --- a/profiles/apparmor/profiles/extras/postfix-pickup +++ b/profiles/apparmor/profiles/extras/postfix-pickup @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-pipe b/profiles/apparmor/profiles/extras/postfix-pipe index 6567568bc..f1904a202 100644 --- a/profiles/apparmor/profiles/extras/postfix-pipe +++ b/profiles/apparmor/profiles/extras/postfix-pipe @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-postscreen b/profiles/apparmor/profiles/extras/postfix-postscreen index ace8edb6c..c2a5abc32 100644 --- a/profiles/apparmor/profiles/extras/postfix-postscreen +++ b/profiles/apparmor/profiles/extras/postfix-postscreen @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-proxymap b/profiles/apparmor/profiles/extras/postfix-proxymap index 18f0f73de..228dd6924 100644 --- a/profiles/apparmor/profiles/extras/postfix-proxymap +++ b/profiles/apparmor/profiles/extras/postfix-proxymap @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-qmgr b/profiles/apparmor/profiles/extras/postfix-qmgr index 93f74e70b..814c3a637 100644 --- a/profiles/apparmor/profiles/extras/postfix-qmgr +++ b/profiles/apparmor/profiles/extras/postfix-qmgr @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-qmqpd b/profiles/apparmor/profiles/extras/postfix-qmqpd index fbcdd9aee..70a880630 100644 --- a/profiles/apparmor/profiles/extras/postfix-qmqpd +++ b/profiles/apparmor/profiles/extras/postfix-qmqpd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-scache b/profiles/apparmor/profiles/extras/postfix-scache index 070171cab..ab4d5e932 100644 --- a/profiles/apparmor/profiles/extras/postfix-scache +++ b/profiles/apparmor/profiles/extras/postfix-scache @@ -11,7 +11,7 @@ # vim:syntax=apparmor # Last Modified: Tue May 31 09:46:20 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-showq b/profiles/apparmor/profiles/extras/postfix-showq index be2ed2fa7..e3d968c20 100644 --- a/profiles/apparmor/profiles/extras/postfix-showq +++ b/profiles/apparmor/profiles/extras/postfix-showq @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-smtp b/profiles/apparmor/profiles/extras/postfix-smtp index bf26529d4..70b8ecd8d 100644 --- a/profiles/apparmor/profiles/extras/postfix-smtp +++ b/profiles/apparmor/profiles/extras/postfix-smtp @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-smtpd b/profiles/apparmor/profiles/extras/postfix-smtpd index 8b397f32b..944c99f0c 100644 --- a/profiles/apparmor/profiles/extras/postfix-smtpd +++ b/profiles/apparmor/profiles/extras/postfix-smtpd @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-spawn b/profiles/apparmor/profiles/extras/postfix-spawn index 721849ad5..a19417bd6 100644 --- a/profiles/apparmor/profiles/extras/postfix-spawn +++ b/profiles/apparmor/profiles/extras/postfix-spawn @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-tlsmgr b/profiles/apparmor/profiles/extras/postfix-tlsmgr index f74c39333..5046ac70a 100644 --- a/profiles/apparmor/profiles/extras/postfix-tlsmgr +++ b/profiles/apparmor/profiles/extras/postfix-tlsmgr @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-trivial-rewrite b/profiles/apparmor/profiles/extras/postfix-trivial-rewrite index 59fc6b4d7..408aa6920 100644 --- a/profiles/apparmor/profiles/extras/postfix-trivial-rewrite +++ b/profiles/apparmor/profiles/extras/postfix-trivial-rewrite @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-verify b/profiles/apparmor/profiles/extras/postfix-verify index b2f52d950..ee4895874 100644 --- a/profiles/apparmor/profiles/extras/postfix-verify +++ b/profiles/apparmor/profiles/extras/postfix-verify @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/postfix-virtual b/profiles/apparmor/profiles/extras/postfix-virtual index 89b2f59d4..59cf73a2a 100644 --- a/profiles/apparmor/profiles/extras/postfix-virtual +++ b/profiles/apparmor/profiles/extras/postfix-virtual @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/rpcbind b/profiles/apparmor/profiles/extras/rpcbind index 732c43534..634fc5f96 100644 --- a/profiles/apparmor/profiles/extras/rpcbind +++ b/profiles/apparmor/profiles/extras/rpcbind @@ -1,7 +1,7 @@ # vim:syntax=apparmor # Author: Daniel Richard G. -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.dhclient b/profiles/apparmor/profiles/extras/sbin.dhclient index 095615a97..b791066c8 100644 --- a/profiles/apparmor/profiles/extras/sbin.dhclient +++ b/profiles/apparmor/profiles/extras/sbin.dhclient @@ -19,7 +19,7 @@ # /usr/bin/vmstat mrix, # /usr/bin/w mrix, -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.dhclient-script b/profiles/apparmor/profiles/extras/sbin.dhclient-script index 16a9a5e8f..a73809e87 100644 --- a/profiles/apparmor/profiles/extras/sbin.dhclient-script +++ b/profiles/apparmor/profiles/extras/sbin.dhclient-script @@ -1,6 +1,6 @@ # Last Modified: Tue Jan 25 16:48:30 2011 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.dhcpcd b/profiles/apparmor/profiles/extras/sbin.dhcpcd index 60745d309..5c485ec26 100644 --- a/profiles/apparmor/profiles/extras/sbin.dhcpcd +++ b/profiles/apparmor/profiles/extras/sbin.dhcpcd @@ -16,7 +16,7 @@ # # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.portmap b/profiles/apparmor/profiles/extras/sbin.portmap index c1beff557..e2783fd3f 100644 --- a/profiles/apparmor/profiles/extras/sbin.portmap +++ b/profiles/apparmor/profiles/extras/sbin.portmap @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.resmgrd b/profiles/apparmor/profiles/extras/sbin.resmgrd index aee87796f..bbbc4021f 100644 --- a/profiles/apparmor/profiles/extras/sbin.resmgrd +++ b/profiles/apparmor/profiles/extras/sbin.resmgrd @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Mon Mar 13 15:55:30 2006 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.rpc.lockd b/profiles/apparmor/profiles/extras/sbin.rpc.lockd index dab9dfc07..772e12551 100644 --- a/profiles/apparmor/profiles/extras/sbin.rpc.lockd +++ b/profiles/apparmor/profiles/extras/sbin.rpc.lockd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/sbin.rpc.statd b/profiles/apparmor/profiles/extras/sbin.rpc.statd index ec0d85705..42ba0ce29 100644 --- a/profiles/apparmor/profiles/extras/sbin.rpc.statd +++ b/profiles/apparmor/profiles/extras/sbin.rpc.statd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.NX.bin.nxclient b/profiles/apparmor/profiles/extras/usr.NX.bin.nxclient index d1244f39a..c82090380 100644 --- a/profiles/apparmor/profiles/extras/usr.NX.bin.nxclient +++ b/profiles/apparmor/profiles/extras/usr.NX.bin.nxclient @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.acroread b/profiles/apparmor/profiles/extras/usr.bin.acroread index d88aaadf7..75de6889b 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.acroread +++ b/profiles/apparmor/profiles/extras/usr.bin.acroread @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Wed Aug 24 16:21:32 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.apropos b/profiles/apparmor/profiles/extras/usr.bin.apropos index 0ac126cc1..a39edb466 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.apropos +++ b/profiles/apparmor/profiles/extras/usr.bin.apropos @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.dumpcap b/profiles/apparmor/profiles/extras/usr.bin.dumpcap index c23c378c6..68dbb47e5 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.dumpcap +++ b/profiles/apparmor/profiles/extras/usr.bin.dumpcap @@ -1,6 +1,6 @@ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.evolution-2.10 b/profiles/apparmor/profiles/extras/usr.bin.evolution-2.10 index 50e8e64c4..c98318e40 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.evolution-2.10 +++ b/profiles/apparmor/profiles/extras/usr.bin.evolution-2.10 @@ -38,7 +38,7 @@ # # -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.fam b/profiles/apparmor/profiles/extras/usr.bin.fam index 3981ef420..fa50df548 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.fam +++ b/profiles/apparmor/profiles/extras/usr.bin.fam @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.freshclam b/profiles/apparmor/profiles/extras/usr.bin.freshclam index 69ce3a56a..6ad0ba7d3 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.freshclam +++ b/profiles/apparmor/profiles/extras/usr.bin.freshclam @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.gaim b/profiles/apparmor/profiles/extras/usr.bin.gaim index 0ed2fb8e0..67a2ea640 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.gaim +++ b/profiles/apparmor/profiles/extras/usr.bin.gaim @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Fri Sep 2 19:07:43 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.man b/profiles/apparmor/profiles/extras/usr.bin.man index ffc3adf07..a76d17096 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.man +++ b/profiles/apparmor/profiles/extras/usr.bin.man @@ -12,7 +12,7 @@ # vim:syntax=apparmor # -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce index 6eaa4aba7..10a14975c 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-maintd b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-maintd index bf300e676..27374208f 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-maintd +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-maintd @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-make-ml.sh b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-make-ml.sh index 3ca7b9abf..24f3e56f6 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-make-ml.sh +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-make-ml.sh @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-process b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-process index abeb56ada..21ac1bb93 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-process +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-process @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-receive b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-receive index 78f11b6bb..ac142976a 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-receive +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-receive @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-recieve b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-recieve index 5337b256d..2a1261ec3 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-recieve +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-recieve @@ -13,7 +13,7 @@ # mlmmj upstream renamed the (misspelled) mlmmj-recieve to mlmmj-receive, # so this profile is probably superfluous -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-send b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-send index f399af930..097fce440 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-send +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-send @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-sub b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-sub index 248a14a6f..bdc77803b 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-sub +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-sub @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-unsub b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-unsub index f6a4d5e70..51c97e914 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.mlmmj-unsub +++ b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-unsub @@ -10,7 +10,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.opera b/profiles/apparmor/profiles/extras/usr.bin.opera index 1bda4ba3d..66e6d5cfc 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.opera +++ b/profiles/apparmor/profiles/extras/usr.bin.opera @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include /usr/bin/opera { diff --git a/profiles/apparmor/profiles/extras/usr.bin.passwd b/profiles/apparmor/profiles/extras/usr.bin.passwd index 80ca9c180..a137517c1 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.passwd +++ b/profiles/apparmor/profiles/extras/usr.bin.passwd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.procmail b/profiles/apparmor/profiles/extras/usr.bin.procmail index c3a758a55..eb7ed544a 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.procmail +++ b/profiles/apparmor/profiles/extras/usr.bin.procmail @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.skype b/profiles/apparmor/profiles/extras/usr.bin.skype index 776f6c59c..a49cba1ce 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.skype +++ b/profiles/apparmor/profiles/extras/usr.bin.skype @@ -3,7 +3,7 @@ # - Андрей Калинин, LP: #226624 # - Jamie Strandboge and Ivan Frederiks, LP: #933440 -abi , +abi , include /usr/bin/skype flags=(complain) { diff --git a/profiles/apparmor/profiles/extras/usr.bin.spamc b/profiles/apparmor/profiles/extras/usr.bin.spamc index 00189384e..ef7b09f4c 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.spamc +++ b/profiles/apparmor/profiles/extras/usr.bin.spamc @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Wed Feb 23 11:03:18 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.svnserve b/profiles/apparmor/profiles/extras/usr.bin.svnserve index e5d96861a..b7599250c 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.svnserve +++ b/profiles/apparmor/profiles/extras/usr.bin.svnserve @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.wireshark b/profiles/apparmor/profiles/extras/usr.bin.wireshark index 261ca763c..b05823dc2 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.wireshark +++ b/profiles/apparmor/profiles/extras/usr.bin.wireshark @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.bin.xfs b/profiles/apparmor/profiles/extras/usr.bin.xfs index 4cebe7043..05437dc52 100644 --- a/profiles/apparmor/profiles/extras/usr.bin.xfs +++ b/profiles/apparmor/profiles/extras/usr.bin.xfs @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib.GConf.2.gconfd-2 b/profiles/apparmor/profiles/extras/usr.lib.GConf.2.gconfd-2 index d9bee8e35..385b39e7a 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.GConf.2.gconfd-2 +++ b/profiles/apparmor/profiles/extras/usr.lib.GConf.2.gconfd-2 @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib.RealPlayer10.realplay b/profiles/apparmor/profiles/extras/usr.lib.RealPlayer10.realplay index b0b5b9024..d9190b08c 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.RealPlayer10.realplay +++ b/profiles/apparmor/profiles/extras/usr.lib.RealPlayer10.realplay @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Wed Aug 31 11:14:09 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib.bonobo.bonobo-activation-server b/profiles/apparmor/profiles/extras/usr.lib.bonobo.bonobo-activation-server index 156cb2fa4..1d5209220 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.bonobo.bonobo-activation-server +++ b/profiles/apparmor/profiles/extras/usr.lib.bonobo.bonobo-activation-server @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Mon Aug 29 10:49:30 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib.evolution-data-server.evolution-data-server-1.10 b/profiles/apparmor/profiles/extras/usr.lib.evolution-data-server.evolution-data-server-1.10 index c0f80a076..57e328c4a 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.evolution-data-server.evolution-data-server-1.10 +++ b/profiles/apparmor/profiles/extras/usr.lib.evolution-data-server.evolution-data-server-1.10 @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib.firefox.mozilla-xremote-client b/profiles/apparmor/profiles/extras/usr.lib.firefox.mozilla-xremote-client index 2d9a50d6c..c33c97c77 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.firefox.mozilla-xremote-client +++ b/profiles/apparmor/profiles/extras/usr.lib.firefox.mozilla-xremote-client @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib.man-db.man b/profiles/apparmor/profiles/extras/usr.lib.man-db.man index 8fcf46604..5b099be2e 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.man-db.man +++ b/profiles/apparmor/profiles/extras/usr.lib.man-db.man @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.lib64.GConf.2.gconfd-2 b/profiles/apparmor/profiles/extras/usr.lib64.GConf.2.gconfd-2 index 0c4b367de..f932f57d4 100644 --- a/profiles/apparmor/profiles/extras/usr.lib64.GConf.2.gconfd-2 +++ b/profiles/apparmor/profiles/extras/usr.lib64.GConf.2.gconfd-2 @@ -10,7 +10,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.cupsd b/profiles/apparmor/profiles/extras/usr.sbin.cupsd index d059ec97a..9b51b8453 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.cupsd +++ b/profiles/apparmor/profiles/extras/usr.sbin.cupsd @@ -1,6 +1,6 @@ # Last Modified: Sun Sep 16 18:11:15 2007 -abi , +abi , include /usr/sbin/cupsd { diff --git a/profiles/apparmor/profiles/extras/usr.sbin.dhcpd b/profiles/apparmor/profiles/extras/usr.sbin.dhcpd index 19e511d14..2080af228 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.dhcpd +++ b/profiles/apparmor/profiles/extras/usr.sbin.dhcpd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork b/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork index b9ff89a35..a804d91d0 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork +++ b/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.imapd b/profiles/apparmor/profiles/extras/usr.sbin.imapd index c1277bbb7..6d23f9a22 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.imapd +++ b/profiles/apparmor/profiles/extras/usr.sbin.imapd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.in.fingerd b/profiles/apparmor/profiles/extras/usr.sbin.in.fingerd index 685a123c0..43f6bc71d 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.in.fingerd +++ b/profiles/apparmor/profiles/extras/usr.sbin.in.fingerd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.in.ftpd b/profiles/apparmor/profiles/extras/usr.sbin.in.ftpd index d28986cca..04762d8f9 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.in.ftpd +++ b/profiles/apparmor/profiles/extras/usr.sbin.in.ftpd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.in.ntalkd b/profiles/apparmor/profiles/extras/usr.sbin.in.ntalkd index f33033df7..eb0055142 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.in.ntalkd +++ b/profiles/apparmor/profiles/extras/usr.sbin.in.ntalkd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.ipop2d b/profiles/apparmor/profiles/extras/usr.sbin.ipop2d index ca0c4c770..23a088122 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.ipop2d +++ b/profiles/apparmor/profiles/extras/usr.sbin.ipop2d @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.ipop3d b/profiles/apparmor/profiles/extras/usr.sbin.ipop3d index e94ffc5cc..19a91e0e4 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.ipop3d +++ b/profiles/apparmor/profiles/extras/usr.sbin.ipop3d @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.lighttpd b/profiles/apparmor/profiles/extras/usr.sbin.lighttpd index b331509c6..a6c4e7b13 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.lighttpd +++ b/profiles/apparmor/profiles/extras/usr.sbin.lighttpd @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.mysqld b/profiles/apparmor/profiles/extras/usr.sbin.mysqld index 6c93b1582..44828dee4 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.mysqld +++ b/profiles/apparmor/profiles/extras/usr.sbin.mysqld @@ -12,7 +12,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.oidentd b/profiles/apparmor/profiles/extras/usr.sbin.oidentd index 6353b6b5e..447021939 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.oidentd +++ b/profiles/apparmor/profiles/extras/usr.sbin.oidentd @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.popper b/profiles/apparmor/profiles/extras/usr.sbin.popper index 0c6eb5d5f..c7fcc5b77 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.popper +++ b/profiles/apparmor/profiles/extras/usr.sbin.popper @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Wed Aug 31 11:14:09 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.postalias b/profiles/apparmor/profiles/extras/usr.sbin.postalias index c78c35f7f..644b2ec2b 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.postalias +++ b/profiles/apparmor/profiles/extras/usr.sbin.postalias @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.postdrop b/profiles/apparmor/profiles/extras/usr.sbin.postdrop index 8ec184399..65186e158 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.postdrop +++ b/profiles/apparmor/profiles/extras/usr.sbin.postdrop @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.postmap b/profiles/apparmor/profiles/extras/usr.sbin.postmap index 656f10233..6501a34a2 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.postmap +++ b/profiles/apparmor/profiles/extras/usr.sbin.postmap @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.postqueue b/profiles/apparmor/profiles/extras/usr.sbin.postqueue index 9e1355f31..3a0dcf29d 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.postqueue +++ b/profiles/apparmor/profiles/extras/usr.sbin.postqueue @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.sendmail b/profiles/apparmor/profiles/extras/usr.sbin.sendmail index 75e903018..fc7148242 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.sendmail +++ b/profiles/apparmor/profiles/extras/usr.sbin.sendmail @@ -11,7 +11,7 @@ # support /etc/alternatives/ -- SuSE has no such mechanism. So, this # file supports _BOTH_ sendmail's sendmail and postfix's sendmail. -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix b/profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix index 413e1bea6..f36e43227 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix +++ b/profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.sendmail.sendmail b/profiles/apparmor/profiles/extras/usr.sbin.sendmail.sendmail index bf923f83e..04da74786 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.sendmail.sendmail +++ b/profiles/apparmor/profiles/extras/usr.sbin.sendmail.sendmail @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.spamd b/profiles/apparmor/profiles/extras/usr.sbin.spamd index 84b485eb5..dd0d8cfe3 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.spamd +++ b/profiles/apparmor/profiles/extras/usr.sbin.spamd @@ -10,7 +10,7 @@ # vim:syntax=apparmor # Last Modified: Wed Feb 23 11:03:18 2005 -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.squid b/profiles/apparmor/profiles/extras/usr.sbin.squid index 15f8252d8..20208716f 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.squid +++ b/profiles/apparmor/profiles/extras/usr.sbin.squid @@ -9,7 +9,7 @@ # ------------------------------------------------------------------ # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.sshd b/profiles/apparmor/profiles/extras/usr.sbin.sshd index f8e7ea24d..bf870e937 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.sshd +++ b/profiles/apparmor/profiles/extras/usr.sbin.sshd @@ -14,7 +14,7 @@ # # vim:syntax=apparmor -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.useradd b/profiles/apparmor/profiles/extras/usr.sbin.useradd index 2f59f6d6f..0f8d255fa 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.useradd +++ b/profiles/apparmor/profiles/extras/usr.sbin.useradd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.userdel b/profiles/apparmor/profiles/extras/usr.sbin.userdel index 5014c9c7f..56a013d5b 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.userdel +++ b/profiles/apparmor/profiles/extras/usr.sbin.userdel @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.vsftpd b/profiles/apparmor/profiles/extras/usr.sbin.vsftpd index 994fad61c..e081e6d08 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.vsftpd +++ b/profiles/apparmor/profiles/extras/usr.sbin.vsftpd @@ -9,7 +9,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include diff --git a/profiles/apparmor/profiles/extras/usr.sbin.xinetd b/profiles/apparmor/profiles/extras/usr.sbin.xinetd index 844f156cc..0a66ad10d 100644 --- a/profiles/apparmor/profiles/extras/usr.sbin.xinetd +++ b/profiles/apparmor/profiles/extras/usr.sbin.xinetd @@ -8,7 +8,7 @@ # # ------------------------------------------------------------------ -abi , +abi , include