[apparmor] [patch] fix and cleanup logparser.py add_event_to_tree()

[Christian Boltz]

Hello,

this patch fixes a bug in logparser.py add_event_to_tree(). It looked 
for '\\null-/' - but should look for '//null-' instead.

Also remove some code duplication by merging with the next condition, 
which executes the same self.add_to_tree code.


=== modified file 'utils/apparmor/logparser.py'
--- utils/apparmor/logparser.py 2014-07-14 19:01:15 +0000
+++ utils/apparmor/logparser.py 2014-08-17 19:36:34 +0000
@@ -255,10 +257,7 @@
             if e.get('info', False) and e['info'] == 'mandatory profile missing':
                 self.add_to_tree(e['pid'], e['parent'], 'exec',
                                  [profile, hat, aamode, 'PERMITTING', e['denied_mask'], e['name'], e['name2']])
-            elif e.get('name2', False) and '\\null-/' in e['name2']:
-                self.add_to_tree(e['pid'], e['parent'], 'exec',
-                                 [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
-            elif e.get('name', False):
+            elif (e.get('name2', False) and '//null-' in e['name2']) or e.get('name', False):
                 self.add_to_tree(e['pid'], e['parent'], 'exec',
                                  [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
             else:




Regards,

Christian Boltz
-- 
_sehr_ alt: ich musste neulich wieder feststellen, dass bei einem 32bit
System nach (2^^32-1)/100 Sekunden Laufzeit es nicht mehr sinnvoll
möglich ist, die uptime zu ermitteln :) [Wolfgang Hamann in opensuse-de]