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

Handle substitutions for /

Browse Source 
- semanage fcontext -a -e  / /opt/rh/devtoolset-2/root
This commit is contained in:
Dan Walsh 2013-04-17 18:07:46 -04:00
parent 1961617545
commit def2153558
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libselinux-rhat.patch
View File

@ -652,6 +652,20 @@ index b9e8002..355730a 100644
} }
hidden_def(get_ordered_context_list) hidden_def(get_ordered_context_list)
diff --git a/libselinux/src/label.c b/libselinux/src/label.c
index 11f6e96..9bf79c5 100644
--- a/libselinux/src/label.c
+++ b/libselinux/src/label.c
@@ -48,6 +48,9 @@ static char *selabel_sub(struct selabel_sub *ptr, const char *src)
if (strncmp(src, ptr->src, ptr->slen) == 0 ) {
if (src[ptr->slen] == '/' ||
src[ptr->slen] == 0) {
+ if ((src[ptr->slen] == '/') &&
+ (strcmp(ptr->dst, "/") == 0))
+ ptr->slen++;
if (asprintf(&dst, "%s%s", ptr->dst, &src[ptr->slen]) < 0)
return NULL;
return dst;
diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
index 5f697f3..9b0d6b0 100644 index 5f697f3..9b0d6b0 100644
--- a/libselinux/src/label_file.c --- a/libselinux/src/label_file.c

6
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.1.13 Version: 2.1.13
Release: 13%{?dist} Release: 14%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
Source: %{name}-%{version}.tgz Source: %{name}-%{version}.tgz
@ -241,6 +241,10 @@ rm -rf %{buildroot}
%{ruby_sitearch}/selinux.so %{ruby_sitearch}/selinux.so
%changelog %changelog
* Wed Apr 17 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.13-14
- Handle substitutions for /
- semanage fcontext -a -e / /opt/rh/devtoolset-2/root
* Tue Apr 9 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.13-13 * Tue Apr 9 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.13-13
- Add Eric Paris patch to fix procattr calls after a fork. - Add Eric Paris patch to fix procattr calls after a fork.