|
|
2136436 |
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.49/include/selinux/av_permissions.h
|
|
|
c4aa29e |
--- nsalibselinux/include/selinux/av_permissions.h 2007-11-15 15:52:46.000000000 -0500
|
|
|
2136436 |
+++ libselinux-2.0.49/include/selinux/av_permissions.h 2008-01-25 10:31:28.000000000 -0500
|
|
|
c4aa29e |
@@ -900,6 +900,8 @@
|
|
|
c4aa29e |
#define PACKET__SEND 0x00000001UL
|
|
|
c4aa29e |
#define PACKET__RECV 0x00000002UL
|
|
|
c4aa29e |
#define PACKET__RELABELTO 0x00000004UL
|
|
|
c4aa29e |
+#define PACKET__FLOW_IN 0x00000008UL
|
|
|
c4aa29e |
+#define PACKET__FLOW_OUT 0x00000010UL
|
|
|
c4aa29e |
#define KEY__VIEW 0x00000001UL
|
|
|
c4aa29e |
#define KEY__READ 0x00000002UL
|
|
|
c4aa29e |
#define KEY__WRITE 0x00000004UL
|
|
|
2136436 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.49/src/audit2why.c
|
|
|
2136436 |
--- nsalibselinux/src/audit2why.c 2008-01-23 16:47:07.000000000 -0500
|
|
|
2136436 |
+++ libselinux-2.0.49/src/audit2why.c 2008-01-25 10:58:28.000000000 -0500
|
|
|
2136436 |
@@ -5,6 +5,7 @@
|
|
|
2136436 |
#include <getopt.h>
|
|
|
2136436 |
#include <limits.h>
|
|
|
2136436 |
#include <sepol/sepol.h>
|
|
|
2136436 |
+#include <sepol/policydb.h>
|
|
|
2136436 |
#include <sepol/policydb/services.h>
|
|
|
2136436 |
#include <Python.h>
|
|
|
2136436 |
#include <selinux/selinux.h>
|
|
|
2136436 |
@@ -200,7 +201,7 @@
|
|
|
2136436 |
return 0; // trigger exception
|
|
|
2136436 |
}
|
|
|
2136436 |
} else {
|
|
|
2136436 |
- vers = security_policyvers();
|
|
|
2136436 |
+ vers = sepol_policy_kern_vers_max();
|
|
|
2136436 |
if (vers < 0) {
|
|
|
2136436 |
snprintf(errormsg, sizeof(errormsg),
|
|
|
2136436 |
"Could not get policy version: %s\n",
|
|
|
2136436 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.49/src/matchpathcon.c
|
|
|
39606ee |
--- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
|
|
|
2136436 |
+++ libselinux-2.0.49/src/matchpathcon.c 2008-01-25 10:31:28.000000000 -0500
|
|
|
71cd138 |
@@ -2,6 +2,7 @@
|
|
|
71cd138 |
#include <string.h>
|
|
|
71cd138 |
#include <errno.h>
|
|
|
71cd138 |
#include <stdio.h>
|
|
|
71cd138 |
+#include <syslog.h>
|
|
|
71cd138 |
#include "selinux_internal.h"
|
|
|
71cd138 |
#include "label_internal.h"
|
|
|
71cd138 |
#include "callbacks.h"
|
|
|
0fa749d |
@@ -57,7 +58,7 @@
|
|
|
71cd138 |
{
|
|
|
71cd138 |
va_list ap;
|
|
|
71cd138 |
va_start(ap, fmt);
|
|
|
71cd138 |
- vfprintf(stderr, fmt, ap);
|
|
|
0fa749d |
+ vsyslog(LOG_ERR, fmt, ap);
|
|
|
71cd138 |
va_end(ap);
|
|
|
71cd138 |
}
|
|
|
71cd138 |
|
|
|
2136436 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.49/src/selinuxswig.i
|
|
|
c633d69 |
--- nsalibselinux/src/selinuxswig.i 2008-01-23 14:36:29.000000000 -0500
|
|
|
2136436 |
+++ libselinux-2.0.49/src/selinuxswig.i 2008-01-25 10:31:28.000000000 -0500
|
|
|
c633d69 |
@@ -14,6 +14,7 @@
|
|
|
8054023 |
|
|
|
8054023 |
%typedef unsigned mode_t;
|
|
|
c633d69 |
%typedef unsigned pid_t;
|
|
|
c633d69 |
+%typedef char * security_context_t;
|
|
|
8054023 |
|
|
|
8054023 |
%typemap(in, numinputs=0) (char ***names, int *len) (char **temp1, int temp2) {
|
|
|
8054023 |
$1 = &temp1;
|