Commit 6bc1b6ef authored by Christian Boltz's avatar Christian Boltz

replace copy_netrules_other with list(netrules_other[...]) in

delete_net_duplicates()

Also remove the now unused "import copy".

Acked-by: Kshitij Gupta <kgupta8592@gmail.com>.
parent bafb5ff2
......@@ -12,7 +12,6 @@
#
# ----------------------------------------------------------------------
import re
import copy
import apparmor
......@@ -123,14 +122,13 @@ def delete_cap_duplicates(profilecaps, profilecaps_other, same_profile=True):
def delete_net_duplicates(netrules, netrules_other, same_profile=True):
deleted = 0
hasher_obj = apparmor.aa.hasher()
copy_netrules_other = copy.deepcopy(netrules_other)
if netrules_other and netrules:
netglob = False
# Delete matching rules
if netrules.get('all', False):
netglob = True
# Iterate over a copy of the rules in the other profile
for fam in copy_netrules_other['rule'].keys():
for fam in list(netrules_other['rule'].keys()):
if netglob or (type(netrules['rule'][fam]) != type(hasher_obj) and netrules['rule'][fam]):
if not same_profile:
if type(netrules_other['rule'][fam]) == type(hasher_obj):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment