mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

parser: consolidate rule class handling into aa_class

Browse Source 
Instead of having each rule individually handle the class info
introduce a class_rule_t into the hierarchy and consolidate.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2021-09-10 13:37:54 -07:00
parent 30206fc11e
commit a2d56c3c74
12 changed files with 100 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
parser/mqueue.cc
View File

@@ -87,6 +87,9 @@ void mqueue_rule::move_conditionals(struct cond_entry *conds)
}
mqueue_rule::mqueue_rule(perms_t perms_p, struct cond_entry *conds, char *qname_p):
// mqueue uses multiple classes, arbitrary choice to represent group
// withing the AST
perms_rule_t(AA_CLASS_POSIX_MQUEUE),
qtype(mqueue_unspecified), qname(qname_p), label(NULL)
{
move_conditionals(conds);
@@ -115,19 +118,17 @@ mqueue_rule::mqueue_rule(perms_t perms_p, struct cond_entry *conds, char *qname_
ostream &mqueue_rule::dump(ostream &os)
{
prefix_rule_t::dump(os);
os << "mqueue ";
class_rule_t::dump(os);
// do we want to always put type out or leave it implied if there
// is a qname
if (qtype == mqueue_posix)
os << "type=posix";
os << " type=posix";
else if (qtype == mqueue_sysv)
os << "type=sysv";
os << " type=sysv";
if (perms != AA_VALID_MQUEUE_PERMS) {
os << "(";
os << " ( ";
if (perms & AA_MQUEUE_WRITE)
os << "write ";