2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00

revert "profiles: support void-specific binary names for openntpd, traceroute, and ping"

This reverts the following commit which changes the profile names -
something we should avoid on an old branch.

commit ae3e230b053e0521f54ea1590326dae895b7642c
Author: Cameron Nemo <camerontnorman@gmail.com>
Date:   Tue Sep 11 09:54:33 2018 -0700

    profiles: support void-specific binary names for openntpd, traceroute, and ping

    (cherry picked from commit 6e28a94ace)
    Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Christian Boltz
2018-10-21 13:25:36 +02:00
parent eaa7f03064
commit e5a72e8efb
3 changed files with 7 additions and 6 deletions

View File

@@ -10,7 +10,7 @@
# ------------------------------------------------------------------
#include <tunables/global>
profile ping /{usr/,}bin/{,iputils-}ping {
profile ping /{usr/,}bin/ping {
#include <abstractions/base>
#include <abstractions/consoles>
#include <abstractions/nameservice>
@@ -20,7 +20,7 @@ profile ping /{usr/,}bin/{,iputils-}ping {
network inet raw,
network inet6 raw,
/{,usr/}bin/{,iputils-}ping mixr,
/{,usr/}bin/ping mixr,
/etc/modules.conf r,
# Site-specific additions and overrides. See local/README for details.

View File

@@ -11,7 +11,7 @@
#include <tunables/global>
#include <tunables/ntpd>
/usr/{bin,sbin}/{,open}ntpd flags=(attach_disconnected) {
/usr/{bin,sbin}/ntpd flags=(attach_disconnected) {
#include <abstractions/base>
#include <abstractions/nameservice>
#include <abstractions/openssl>
@@ -40,7 +40,7 @@
/tmp/ntp* rwl,
/{usr/,usr/local/,}{s,}bin/ r,
/usr/{bin,sbin}/{,open}ntpd rmix,
/usr/{bin,sbin}/ntpd rmix,
/var/db/ r,
/var/db/ntpd.drift rwl,
/var/lib/ntp/drift rwl,

View File

@@ -10,7 +10,7 @@
# ------------------------------------------------------------------
#include <tunables/global>
profile traceroute /usr/{{bin,sbin}/traceroute,bin/linux-traceroute,bin/traceroute.db} {
/usr/{{bin,sbin}/traceroute,bin/traceroute.db} {
#include <abstractions/base>
#include <abstractions/consoles>
#include <abstractions/nameservice>
@@ -21,7 +21,8 @@ profile traceroute /usr/{{bin,sbin}/traceroute,bin/linux-traceroute,bin/tracerou
network inet raw,
network inet6 raw,
/usr/{{bin,sbin}/traceroute,bin/linux-traceroute,bin/traceroute.db} mrix,
/usr/{bin,sbin}/traceroute mrix,
/usr/bin/traceroute.db mrix,
@{PROC}/net/route r,
@{PROC}/sys/net/ipv4/{tcp_ecn,tcp_sack,tcp_timestamps,tcp_window_scaling} r,