From 8b0e2bdc941b8a38c1e7dd9cd306fbe641863e55 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Sun, 25 Mar 2018 22:02:54 -0700 Subject: [PATCH] profiles/postfix-master: use profile name instead of match pattern Convert postfix's master profile to use a named profile (postfix-master) rather than the exec path match pattern. Adjust postfix-common abstraction to take this into account. Rename profile name in the profiles/apparmor/profiles/extras/ directory to match the profile name. Signed-off-by: Steve Beattie (cherry picked from commit 01648c6a61519a01d5bf54270c3a75557f1cb5cb) --- .../extras/{usr.lib.postfix.master => postfix.master} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename profiles/apparmor/profiles/extras/{usr.lib.postfix.master => postfix.master} (92%) diff --git a/profiles/apparmor/profiles/extras/usr.lib.postfix.master b/profiles/apparmor/profiles/extras/postfix.master similarity index 92% rename from profiles/apparmor/profiles/extras/usr.lib.postfix.master rename to profiles/apparmor/profiles/extras/postfix.master index c0f9c5490..377e772fb 100644 --- a/profiles/apparmor/profiles/extras/usr.lib.postfix.master +++ b/profiles/apparmor/profiles/extras/postfix.master @@ -1,6 +1,7 @@ # ------------------------------------------------------------------ # # Copyright (C) 2002-2006 Novell/SUSE +# Copyright (C) 2018 Canonical, Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -10,7 +11,7 @@ #include -/usr/lib/postfix/master { +profile postfix-master /usr/lib/postfix/{sbin/,}master { #include #include #include @@ -30,7 +31,7 @@ /usr/lib/postfix/cleanup Px, /usr/lib/postfix/flush Px, /usr/lib/postfix/local Px, - /usr/lib/postfix/master rmix, + /usr/lib/postfix/{sbin/,}master rmix, /usr/lib/postfix/nqmgr Px, /usr/lib/postfix/proxymap Px, /usr/lib/postfix/pickup Px,