The patch that adds support for af_unix rules added a _Raw_Rule base class to inherit from in rules.py. This patch converts the rest of the raw rules classes to use the same.
Signed-off-by: Steve Beattie <[email protected]> --- utils/apparmor/rules.py | 65 +++++++----------------------------------------- 1 file changed, 10 insertions(+), 55 deletions(-) Index: b/utils/apparmor/rules.py =================================================================== --- a/utils/apparmor/rules.py +++ b/utils/apparmor/rules.py @@ -56,65 +56,20 @@ class _Raw_Rule(object): 'deny ' if self.deny else '', self.rule) -class Raw_DBUS_Rule(object): - audit = False - deny = False - - def __init__(self, rule): - self.rule = rule - - def serialize(self): - return "%s%s%s" % ('audit ' if self.audit else '', - 'deny ' if self.deny else '', - self.rule) - -class Raw_Mount_Rule(object): - audit = False - deny = False - - def __init__(self, rule): - self.rule = rule - - def serialize(self): - return "%s%s%s" % ('audit ' if self.audit else '', - 'deny ' if self.deny else '', - self.rule) - -class Raw_Signal_Rule(object): - audit = False - deny = False - - def __init__(self, rule): - self.rule = rule - - def serialize(self): - return "%s%s%s" % ('audit ' if self.audit else '', - 'deny ' if self.deny else '', - self.rule) - -class Raw_Ptrace_Rule(object): - audit = False - deny = False - - def __init__(self, rule): - self.rule = rule +class Raw_DBUS_Rule(_Raw_Rule): + pass - def serialize(self): - return "%s%s%s" % ('audit ' if self.audit else '', - 'deny ' if self.deny else '', - self.rule) +class Raw_Mount_Rule(_Raw_Rule): + pass -class Raw_Pivot_Root_Rule(object): - audit = False - deny = False +class Raw_Signal_Rule(_Raw_Rule): + pass - def __init__(self, rule): - self.rule = rule +class Raw_Ptrace_Rule(_Raw_Rule): + pass - def serialize(self): - return "%s%s%s" % ('audit ' if self.audit else '', - 'deny ' if self.deny else '', - self.rule) +class Raw_Pivot_Root_Rule(_Raw_Rule): + pass class Raw_Unix_Rule(_Raw_Rule): pass -- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
