Blame libselinux-rhat.patch
|
|
ca41c6e |
diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.21.1/utils/avcstat.c
|
|
|
ca41c6e |
--- nsalibselinux/utils/avcstat.c 2005-01-20 16:05:24.000000000 -0500
|
|
|
ca41c6e |
+++ libselinux-1.21.1/utils/avcstat.c 2005-01-21 15:52:50.111732000 -0500
|
|
|
ca41c6e |
@@ -68,7 +68,7 @@
|
|
|
ca41c6e |
printf("program will loop, displaying updated statistics every \'interval\' seconds.\n");
|
|
|
ca41c6e |
printf("Relative values are displayed by default. Use the -c option to specify the\n");
|
|
|
ca41c6e |
printf("display of cumulative values. The -f option specifies the location of the\n");
|
|
|
ca41c6e |
- printf("AVC statistics file, defaulting to \'%s\%s\'.\n\n", selinux_mnt, DEF_STAT_FILE);
|
|
|
ca41c6e |
+ printf("AVC statistics file, defaulting to \'%s%s\'.\n\n", selinux_mnt, DEF_STAT_FILE);
|
|
|
ca41c6e |
}
|
|
|
ca41c6e |
|
|
|
ca41c6e |
static void set_window_rows(void)
|
|
|
e0a30a3 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/rpm.c libselinux-1.21.1/src/rpm.c
|
|
|
e0a30a3 |
--- nsalibselinux/src/rpm.c 2004-11-09 09:13:54.000000000 -0500
|
|
|
e0a30a3 |
+++ libselinux-1.21.1/src/rpm.c 2005-01-24 15:24:33.000000000 -0500
|
|
|
e0a30a3 |
@@ -41,8 +41,10 @@
|
|
|
e0a30a3 |
rc = setexeccon(newcon);
|
|
|
e0a30a3 |
if (rc < 0)
|
|
|
e0a30a3 |
goto out;
|
|
|
e0a30a3 |
- rc = execve(filename, argv, envp);
|
|
|
e0a30a3 |
out:
|
|
|
e0a30a3 |
+ if ( ( rc == 0 ) ||
|
|
|
e0a30a3 |
+ (security_getenforce() == 0 ))
|
|
|
e0a30a3 |
+ rc = execve(filename, argv, envp);
|
|
|
e0a30a3 |
context_free(con);
|
|
|
e0a30a3 |
freecon(newcon);
|
|
|
e0a30a3 |
freecon(fcon);
|