Merge remote-tracking branch 'origin/master' into f26

Revert "Enable expand-check in semanage.conf"
There are several update issues which need to be soled first before we enable this in a stable release. For more information see https://bugzilla.redhat.com/show_bug.cgi?id=1319652#c25 This reverts commit e2707be9e1.
2017-04-28 12:42:02 +02:00 · 2017-04-19 15:43:47 +02:00
2 changed files with 3 additions and 1 deletions
--- a/libsemanage.spec
+++ b/libsemanage.spec
@ -197,6 +197,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %changelog
 * Fri Apr 28 2017 Petr Lautrbach <plautrba@redhat.com> - 2.6-4
 - Follow upstream and rename _semanage.so to _semanage.cpython-36m-x86_64-linux-gnu.so
+- Revert "Enable expand-check by default" in order to avoid possible upgrade issues,
+  see https://bugzilla.redhat.com/show_bug.cgi?id=1319652#c25

 * Tue Apr 18 2017 Petr Lautrbach <plautrba@redhat.com> - 2.6-3
 - Do not list duplicate port entries after setting a boolean (#1439875)
--- a/semanage.conf
+++ b/semanage.conf
@ -39,7 +39,7 @@ module-store = direct
 # expand-check check neverallow rules when executing all semanage
 # commands. There might be a penalty in execution time if this
 # option is enabled.
-expand-check = 1
+expand-check=0

 # usepasswd check tells semanage to scan all pass word records for home directories
 # and setup the labeling correctly.  If this is turned off, SELinux will label /home
Author	SHA1	Message	Date
Petr Lautrbach	64efa5b6db	Merge remote-tracking branch 'origin/master' into f26	2017-04-28 12:42:02 +02:00
Petr Lautrbach	26525b0f1e	Revert "Enable expand-check in semanage.conf" There are several update issues which need to be soled first before we enable this in a stable release. For more information see https://bugzilla.redhat.com/show_bug.cgi?id=1319652#c25 This reverts commit `e2707be9e1`.	2017-04-19 15:43:47 +02:00