From f931daa771649d8345bf8cb555427767cba80c0f Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Fri, 2 Apr 2021 17:48:47 +0200 Subject: [PATCH] ask_conflict_mode: drop superfluous parameters profile and hat are not needed by this function. --- utils/apparmor/aa.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/apparmor/aa.py b/utils/apparmor/aa.py index 98c94becb..b568ac6e5 100644 --- a/utils/apparmor/aa.py +++ b/utils/apparmor/aa.py @@ -1122,7 +1122,7 @@ def ask_the_questions(log_dict): aa[profile][hat]['profile'] = False # check for and ask about conflicting exec modes - ask_conflict_mode(profile, hat, aa[profile][hat], log_dict[aamode][profile][hat]) + ask_conflict_mode(aa[profile][hat], log_dict[aamode][profile][hat]) prof_changed, end_profiling = ask_rule_questions(log_dict[aamode][profile][hat], combine_name(profile, hat), aa[profile][hat], ruletypes) if prof_changed: @@ -1380,7 +1380,7 @@ def delete_all_duplicates(profile, incname, r_types): return deleted -def ask_conflict_mode(profile, hat, old_profile, merge_profile): +def ask_conflict_mode(old_profile, merge_profile): '''ask user about conflicting exec rules''' for oldrule in old_profile['file'].rules: conflictingrules = merge_profile['file'].get_exec_conflict_rules(oldrule)