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