apparmor: convert xmatch to using the new shared policydb struct

continue permission unification by converting xmatch to use the
policydb struct that is used by the other profile dfas.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2022-10-03 14:49:03 -07:00
parent 53bdc46f4b
commit 048d495444
6 changed files with 28 additions and 29 deletions
+1 -3
View File
@@ -113,7 +113,6 @@ struct aa_data {
* @attach: human readable attachment string
* @xmatch: optional extended matching for unconfined executables names
* @xmatch_len: xmatch prefix len, used to determine xmatch priority
* @xmatch_perms: precomputed permissions for the xmatch DFA indexed by state
* @audit: the auditing mode of the profile
* @mode: the enforcement mode of the profile
* @path_flags: flags controlling path generation behavior
@@ -148,9 +147,8 @@ struct aa_profile {
const char *rename;
const char *attach;
struct aa_dfa *xmatch;
struct aa_policydb xmatch;
unsigned int xmatch_len;
struct aa_perms *xmatch_perms;
enum audit_mode audit;
long mode;