fix two issues in aa-genprof's last_audit_entry_time():

- convert "tail" result from byte to string to avoid TypeError crash
- use apparmor.filename instead of hardcoded /var/log/audit/audit.log

Acked-by: Kshitij Gupta <kgupta8592@gmail.com>
This commit is contained in:
Christian Boltz 2014-05-21 21:42:43 +02:00
parent 8c28481311
commit b2c4934bc1

View file

@ -39,8 +39,9 @@ def sysctl_write(path, value):
f_out.write(str(value))
def last_audit_entry_time():
out = subprocess.check_output(['tail', '-1', '/var/log/audit/audit.log'])
out = subprocess.check_output(['tail', '-1', apparmor.filename])
logmark = None
out = out.decode('ascii')
if re.search('^.*msg\=audit\((\d+\.\d+\:\d+).*\).*$', out):
logmark = re.search('^.*msg\=audit\((\d+\.\d+\:\d+).*\).*$', out).groups()[0]
else: