|
|
e1e36a0 |
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.46/include/selinux/av_permissions.h
|
|
|
c4aa29e |
--- nsalibselinux/include/selinux/av_permissions.h 2007-11-15 15:52:46.000000000 -0500
|
|
|
e1e36a0 |
+++ libselinux-2.0.46/include/selinux/av_permissions.h 2008-01-03 15:23:31.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
|
|
|
e1e36a0 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.46/src/Makefile
|
|
|
e1e36a0 |
--- nsalibselinux/src/Makefile 2007-09-26 19:37:45.000000000 -0400
|
|
|
e1e36a0 |
+++ libselinux-2.0.46/src/Makefile 2008-01-03 15:24:29.000000000 -0500
|
|
|
e1e36a0 |
@@ -77,14 +77,14 @@
|
|
|
e1e36a0 |
|
|
|
e1e36a0 |
install: all
|
|
|
e1e36a0 |
test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
|
|
|
e1e36a0 |
- install -m 644 $(LIBA) $(LIBDIR)
|
|
|
e1e36a0 |
test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
|
|
|
e1e36a0 |
install -m 755 $(LIBSO) $(SHLIBDIR)
|
|
|
e1e36a0 |
cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
|
|
|
e1e36a0 |
|
|
|
e1e36a0 |
install-pywrap: pywrap
|
|
|
e1e36a0 |
test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
|
|
|
e1e36a0 |
- install -m 755 $(SWIGFILES) $(PYTHONLIBDIR)/site-packages
|
|
|
e1e36a0 |
+ install -m 755 $(SWIGSO) $(PYTHONLIBDIR)/site-packages
|
|
|
e1e36a0 |
+ install -m 644 selinux.py $(PYTHONLIBDIR)/site-packages
|
|
|
e1e36a0 |
|
|
|
e1e36a0 |
relabel:
|
|
|
e1e36a0 |
/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
|
|
|
e1e36a0 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.46/src/matchpathcon.c
|
|
|
39606ee |
--- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
|
|
|
e1e36a0 |
+++ libselinux-2.0.46/src/matchpathcon.c 2008-01-03 15:23:32.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 |
|
|
|
e1e36a0 |
diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.46/utils/matchpathcon.c
|
|
|
0fa749d |
--- nsalibselinux/utils/matchpathcon.c 2007-07-16 14:20:45.000000000 -0400
|
|
|
e1e36a0 |
+++ libselinux-2.0.46/utils/matchpathcon.c 2008-01-03 15:23:32.000000000 -0500
|
|
|
0fa749d |
@@ -17,10 +17,24 @@
|
|
|
0fa749d |
exit(1);
|
|
|
0fa749d |
}
|
|
|
0fa749d |
|
|
|
0fa749d |
+static void
|
|
|
0fa749d |
+#ifdef __GNUC__
|
|
|
0fa749d |
+ __attribute__ ((format(printf, 1, 2)))
|
|
|
0fa749d |
+#endif
|
|
|
0fa749d |
+ myprintf(const char *fmt, ...)
|
|
|
0fa749d |
+{
|
|
|
0fa749d |
+ va_list ap;
|
|
|
0fa749d |
+ va_start(ap, fmt);
|
|
|
0fa749d |
+ vfprintf(stderr, fmt, ap);
|
|
|
0fa749d |
+ va_end(ap);
|
|
|
0fa749d |
+}
|
|
|
0fa749d |
+
|
|
|
0fa749d |
int printmatchpathcon(char *path, int header, int mode)
|
|
|
0fa749d |
{
|
|
|
0fa749d |
char *buf;
|
|
|
0fa749d |
- int rc = matchpathcon(path, mode, &buf;;
|
|
|
0fa749d |
+ int rc;
|
|
|
0fa749d |
+ set_matchpathcon_printf(myprintf);
|
|
|
0fa749d |
+ rc = matchpathcon(path, mode, &buf;;
|
|
|
0fa749d |
if (rc < 0) {
|
|
|
0fa749d |
fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
|
|
|
0fa749d |
strerror(errno));
|