rpms/libselinux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

revert unexplained change to rhat.patch which broke SELinux disablement

Browse Source
This commit is contained in:
Adam Williamson 2013-12-27 13:07:13 -08:00
parent eb4be25feb
commit 9ba3cdd05f
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libselinux-rhat.patch
View File

@ -511,15 +511,6 @@ index e419f1a..fdeca93 100644
close: close:
close(fd); close(fd);
dlclose: dlclose:
@@ -410,7 +494,7 @@ int selinux_init_load_policy(int *enforce)
* already mounted and selinuxmnt set above.
*/
- if (seconfig == -1) {
+ if (*enforce == -1) {
/* Runtime disable of SELinux. */
rc = security_disable();
if (rc == 0) {
diff --git a/libselinux/src/lsetfilecon.c b/libselinux/src/lsetfilecon.c diff --git a/libselinux/src/lsetfilecon.c b/libselinux/src/lsetfilecon.c
index fd9bb26..932fc62 100644 index fd9bb26..932fc62 100644
--- a/libselinux/src/lsetfilecon.c --- a/libselinux/src/lsetfilecon.c

5
libselinux.spec
View File

@ -10,7 +10,7 @@
Summary: SELinux library and simple utilities Summary: SELinux library and simple utilities
Name: libselinux Name: libselinux
Version: 2.2.1 Version: 2.2.1
Release: 5%{?dist} Release: 6%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
Source: %{name}-%{version}.tgz Source: %{name}-%{version}.tgz
@ -243,6 +243,9 @@ rm -rf %{buildroot}
%{ruby_sitearch}/selinux.so %{ruby_sitearch}/selinux.so
%changelog %changelog
* Fri Dec 27 2013 Adam Williamson <awilliam@redhat.com> - 2.2.1-6
- revert unexplained change to rhat.patch which broke SELinux disablement
* Mon Dec 23 2013 Dan Walsh <dwalsh@redhat.com> - 2.2.1-5 * Mon Dec 23 2013 Dan Walsh <dwalsh@redhat.com> - 2.2.1-5
- Verify context is not null when passed into lsetfilecon_raw - Verify context is not null when passed into lsetfilecon_raw