2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 14:25:52 +00:00

Drop 'localinclude' in parse_profile_data() and ProfileStorage

'localinclude' is/was meant to have 'local/*' includes separate, but
it's write-only and never used, which makes it useless.

Additionally, it causes a crash in the aa-* tools which gets fixed by
removing all the 'localinclude'-related code (what a big word for two
lines ;-)

References: https://bugs.launchpad.net/apparmor/+bug/1848227
This commit is contained in:
Christian Boltz
2019-10-16 21:30:43 +02:00
parent 5066dc6195
commit 001ea9e3af
2 changed files with 0 additions and 3 deletions

View File

@@ -2173,8 +2173,6 @@ def parse_profile_data(data, file, do_include):
elif re_match_include(line):
# Include files
include_name = re_match_include(line)
if include_name.startswith('local/'):
profile_data[profile][hat]['localinclude'][include_name] = True
if profile:
profile_data[profile][hat]['include'][include_name] = True

View File

@@ -60,7 +60,6 @@ class ProfileStorage:
data['alias'] = dict()
data['abi'] = []
data['include'] = dict()
data['localinclude'] = dict()
data['lvar'] = dict()
data['repo'] = dict()