File read_inactive_profile-exactly-once.patch of Package libapparmor

Overview Repositories Revisions Requests Users Attributes Meta

File read_inactive_profile-exactly-once.patch of Package libapparmor (Revision e1c0cabfd2397e2983aed6d55da65462)

Currently displaying revision e1c0cabfd2397e2983aed6d55da65462 , Show latest

commit b307e535fa26bff0abffb6bfd1aeab5d6c7c3622
Author: Christian Boltz <apparmor@cboltz.de>
Date:   Tue Nov 28 21:46:36 2017 +0100

Let read_inactive_profiles() do nothing when calling it the second time
    
    autodep() calls read_inactive_profiles() each time it's called (= for
    each binary). The result is a "Conflicting profile" error (showing the
    same filename twice) if autodep() runs more than once. This can easily
    happen when using "aa-autodep /usr/bin/*".
    
    This patch adds an attribute to read_inactive_profiles() that lets the
    function return without doing anything if was called before.

---
 utils/apparmor/aa.py |    7 +++++++
 1 file changed, 7 insertions(+)

--- a/utils/apparmor/aa.py
+++ b/utils/apparmor/aa.py
@@ -2107,6 +2107,13 @@ def read_profiles():
                 read_profile(profile_dir + '/' + file, True)
 
 def read_inactive_profiles():
+    if hasattr(read_inactive_profiles, 'already_read'):
+        # each autodep() run calls read_inactive_profiles, but that's a) superfluous and b) triggers a conflict because the inactive profiles are already loaded
+        # therefore don't do anything if the inactive profiles were already loaded
+        return
+
+    read_inactive_profiles.already_read = True
+
     if not os.path.exists(extra_profile_dir):
         return None
     try:

Places

File read_inactive_profile-exactly-once.patch of Package libapparmor (Revision e1c0cabfd2397e2983aed6d55da65462)

Places