- Fix audit2why to grab latest policy versus the one selected by the kernel

This commit is contained in:
Daniel J Walsh 2008-01-25 16:11:42 +00:00
parent e4623197a5
commit 213643620c
2 changed files with 30 additions and 7 deletions

View File

@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.48/include/selinux/av_permissions.h
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.49/include/selinux/av_permissions.h
--- nsalibselinux/include/selinux/av_permissions.h 2007-11-15 15:52:46.000000000 -0500
+++ libselinux-2.0.48/include/selinux/av_permissions.h 2008-01-23 14:39:58.000000000 -0500
+++ libselinux-2.0.49/include/selinux/av_permissions.h 2008-01-25 10:31:28.000000000 -0500
@@ -900,6 +900,8 @@
#define PACKET__SEND 0x00000001UL
#define PACKET__RECV 0x00000002UL
@ -10,9 +10,29 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permission
#define KEY__VIEW 0x00000001UL
#define KEY__READ 0x00000002UL
#define KEY__WRITE 0x00000004UL
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.48/src/matchpathcon.c
diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.49/src/audit2why.c
--- nsalibselinux/src/audit2why.c 2008-01-23 16:47:07.000000000 -0500
+++ libselinux-2.0.49/src/audit2why.c 2008-01-25 10:58:28.000000000 -0500
@@ -5,6 +5,7 @@
#include <getopt.h>
#include <limits.h>
#include <sepol/sepol.h>
+#include <sepol/policydb.h>
#include <sepol/policydb/services.h>
#include <Python.h>
#include <selinux/selinux.h>
@@ -200,7 +201,7 @@
return 0; // trigger exception
}
} else {
- vers = security_policyvers();
+ vers = sepol_policy_kern_vers_max();
if (vers < 0) {
snprintf(errormsg, sizeof(errormsg),
"Could not get policy version: %s\n",
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.49/src/matchpathcon.c
--- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
+++ libselinux-2.0.48/src/matchpathcon.c 2008-01-23 14:39:58.000000000 -0500
+++ libselinux-2.0.49/src/matchpathcon.c 2008-01-25 10:31:28.000000000 -0500
@@ -2,6 +2,7 @@
#include <string.h>
#include <errno.h>
@ -30,9 +50,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
va_end(ap);
}
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.48/src/selinuxswig.i
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.49/src/selinuxswig.i
--- nsalibselinux/src/selinuxswig.i 2008-01-23 14:36:29.000000000 -0500
+++ libselinux-2.0.48/src/selinuxswig.i 2008-01-23 14:39:58.000000000 -0500
+++ libselinux-2.0.49/src/selinuxswig.i 2008-01-25 10:31:28.000000000 -0500
@@ -14,6 +14,7 @@
%typedef unsigned mode_t;

View File

@ -4,7 +4,7 @@
Summary: SELinux library and simple utilities
Name: libselinux
Version: 2.0.49
Release: 1%{?dist}
Release: 2%{?dist}
License: Public Domain
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@ -137,6 +137,9 @@ exit 0
%{python_sitearch}/selinux/*
%changelog
* Fri Jan 25 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.49-2
- Fix audit2why to grab latest policy versus the one selected by the kernel
* Wed Jan 23 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.49-1
* Merged audit2why python binding from Dan Walsh.