* Wed Aug 2 2006 Dan Walsh <dwalsh@redhat.com> 1.30.22-3

- Fix audit2allow to handle reload of policy
This commit is contained in:
Daniel J Walsh 2006-08-02 20:53:36 +00:00
parent 5f19ebe323
commit d06137bce3
2 changed files with 29 additions and 1 deletions

View File

@ -1,3 +1,28 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.22/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2006-08-01 09:47:23.000000000 -0400
+++ policycoreutils-1.30.22/audit2allow/audit2allow 2006-08-02 16:50:29.000000000 -0400
@@ -176,7 +176,7 @@
sys.exit(0)
if auditlogs and os.path.exists("/var/log/audit/audit.log"):
- inputfd = os.popen("ausearch -m avc")
+ inputfd = os.popen("ausearch -m avc,MAC_POLICY_LOAD")
serules.load(inputfd)
if buildPP:
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.22/audit2allow/avc.py
--- nsapolicycoreutils/audit2allow/avc.py 2006-07-03 07:52:43.000000000 -0400
+++ policycoreutils-1.30.22/audit2allow/avc.py 2006-08-02 16:50:50.000000000 -0400
@@ -352,6 +352,9 @@
if i == "security_compute_sid:":
self.security_compute_sid(rec)
found = 1
+ elif i == "type=MAC_POLICY_LOAD" and self.last_reload:
+ self.initialize()
+ break
else:
dict.append(i)
if found:
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c
--- nsapolicycoreutils/newrole/newrole.c 2006-07-03 07:52:43.000000000 -0400
+++ policycoreutils-1.30.22/newrole/newrole.c 2006-08-02 14:22:10.000000000 -0400

View File

@ -5,7 +5,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.22
Release: 2
Release: 3
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -119,6 +119,9 @@ fi
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
* Wed Aug 2 2006 Dan Walsh <dwalsh@redhat.com> 1.30.22-3
- Fix audit2allow to handle reload of policy
* Wed Aug 2 2006 Dan Walsh <dwalsh@redhat.com> 1.30.22-2
- Stop restorecond init script when selinux is not enabled