summaryrefslogtreecommitdiffstats
path: root/patches/logrotate-3.7.1/rh-selinux.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/logrotate-3.7.1/rh-selinux.patch')
-rw-r--r--patches/logrotate-3.7.1/rh-selinux.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/patches/logrotate-3.7.1/rh-selinux.patch b/patches/logrotate-3.7.1/rh-selinux.patch
index 0e1a3bbdf..6798ce0b2 100644
--- a/patches/logrotate-3.7.1/rh-selinux.patch
+++ b/patches/logrotate-3.7.1/rh-selinux.patch
@@ -2,10 +2,14 @@ Add selinux_getenforce() calls to work when not in enforcing mode
- use security_getenforce() instead of selinux_getenforcemode
From RedHat patches.
+---
+ logrotate.c | 126 +++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 71 insertions(+), 55 deletions(-)
+
Index: logrotate-3.7.1/logrotate.c
===================================================================
---- logrotate-3.7.1.orig/logrotate.c 2006-04-08 20:42:37.114533654 +0100
-+++ logrotate-3.7.1/logrotate.c 2006-04-08 20:44:17.311634566 +0100
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
@@ -17,6 +17,7 @@
#include <selinux/selinux.h>
static security_context_t prev_context=NULL;
@@ -14,7 +18,7 @@ Index: logrotate-3.7.1/logrotate.c
#endif
#include "basenames.h"
-@@ -293,38 +294,43 @@
+@@ -293,38 +294,43 @@ static int copyTruncate(char * currLog,
return 1;
}
#ifdef WITH_SELINUX
@@ -86,7 +90,7 @@ Index: logrotate-3.7.1/logrotate.c
}
#endif
if (fdsave < 0) {
-@@ -672,28 +678,34 @@
+@@ -672,28 +678,34 @@ int rotateSingleLog(logInfo * log, int l
(log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
#ifdef WITH_SELINUX
@@ -143,7 +147,7 @@ Index: logrotate-3.7.1/logrotate.c
}
#endif
for (i = rotateCount + logStart - 1; (i >= 0) && !hasErrors; i--) {
-@@ -883,11 +895,11 @@
+@@ -883,11 +895,11 @@ int rotateSingleLog(logInfo * log, int l
#ifdef WITH_SELINUX
if (selinux_enabled) {
@@ -160,7 +164,7 @@ Index: logrotate-3.7.1/logrotate.c
}
#endif
free(dirName);
-@@ -1249,6 +1261,10 @@
+@@ -1249,6 +1261,10 @@ int main(int argc, const char ** argv) {
exit(1);
}