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

Switch to use ":" as prefix separator rather then ";"

Browse Source
This commit is contained in:
Dan Walsh 2011-09-14 22:01:30 -04:00
parent 09b67080b4
commit 5113c7563a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libselinux-rhat.patch
View File

@ -1,5 +1,5 @@
diff --git a/libselinux/man/man3/matchpathcon.3 b/libselinux/man/man3/matchpathcon.3 diff --git a/libselinux/man/man3/matchpathcon.3 b/libselinux/man/man3/matchpathcon.3
index cdbb252..0cc2268 100644 index cdbb252..e2a4371 100644
--- a/libselinux/man/man3/matchpathcon.3 --- a/libselinux/man/man3/matchpathcon.3
+++ b/libselinux/man/man3/matchpathcon.3 +++ b/libselinux/man/man3/matchpathcon.3
@@ -8,7 +8,7 @@ matchpathcon, matchpathcon_index \- get the default SELinux security context for @@ -8,7 +8,7 @@ matchpathcon, matchpathcon_index \- get the default SELinux security context for
@ -16,12 +16,12 @@ index cdbb252..0cc2268 100644
by by
.I prefix. .I prefix.
- -
+prefix can have multiple paths separated by ";", for example "/dev;/var/run;/tmp" +prefix can have multiple paths separated by ":", for example "/dev:/var/run:/tmp"
.sp .sp
.B matchpathcon_fini .B matchpathcon_fini
frees the memory allocated by a prior call to frees the memory allocated by a prior call to
diff --git a/libselinux/man/man3/selabel_open.3 b/libselinux/man/man3/selabel_open.3 diff --git a/libselinux/man/man3/selabel_open.3 b/libselinux/man/man3/selabel_open.3
index 8674e37..23df23b 100644 index 8674e37..89bb4d3 100644
--- a/libselinux/man/man3/selabel_open.3 --- a/libselinux/man/man3/selabel_open.3
+++ b/libselinux/man/man3/selabel_open.3 +++ b/libselinux/man/man3/selabel_open.3
@@ -66,6 +66,13 @@ A non-null value for this option enables context validation. By default, @@ -66,6 +66,13 @@ A non-null value for this option enables context validation. By default,
@ -30,7 +30,7 @@ index 8674e37..23df23b 100644
Note that an invalid context may not be treated as an error unless it is actually encountered during a lookup operation. Note that an invalid context may not be treated as an error unless it is actually encountered during a lookup operation.
+.TP +.TP
+.B SELABEL_OPT_SUBSET +.B SELABEL_OPT_SUBSET
+A ";" separates string of path prefixes that tell the system to only loads entries with regular expressions that could match this strings. For example "/dev;/var/run;/tmp". This option can cause the system to use less memory and work faster, but you should only use paths that begin with a prefix. +A ":" separates string of path prefixes that tell the system to only loads entries with regular expressions that could match this strings. For example "/dev:/var/run:/tmp". This option can cause the system to use less memory and work faster, but you should only use paths that begin with a prefix.
+.TP +.TP
+.B SELABEL_OPT_PATH +.B SELABEL_OPT_PATH
+A string representing an alternate path the the regular expressions. +A string representing an alternate path the the regular expressions.
@ -56,7 +56,7 @@ index b245364..7c47222 100644
rc = vfprintf(stderr, fmt, ap); rc = vfprintf(stderr, fmt, ap);
va_end(ap); va_end(ap);
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 3b8346d..ead3b0b 100644 index 3b8346d..02f3f98 100644
--- a/libselinux/src/label_file.c --- a/libselinux/src/label_file.c
+++ b/libselinux/src/label_file.c +++ b/libselinux/src/label_file.c
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@ -125,10 +125,10 @@ index 3b8346d..ead3b0b 100644
+ char *ptr; + char *ptr;
+ i = 0; + i = 0;
+ if (opts[n].value) { + if (opts[n].value) {
+ prefix_array[i] = strtok_r((char *)opts[n].value, ";", &ptr); + prefix_array[i] = strtok_r((char *)opts[n].value, ":", &ptr);
+ while ((prefix_array[i] != NULL) && i < MAX_PREFIX - 1) { + while ((prefix_array[i] != NULL) && i < MAX_PREFIX - 1) {
+ i++; + i++;
+ prefix_array[i] = strtok_r(NULL, ";", &ptr); + prefix_array[i] = strtok_r(NULL, ":", &ptr);
+ } + }
+ } + }
+ +

5
libselinux.spec
View File

@ -7,7 +7,7 @@
Summary: SELinux library and simple utilities Summary: SELinux library and simple utilities
Name: libselinux Name: libselinux
Version: 2.1.5 Version: 2.1.5
Release: 4%{?dist} Release: 5%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
Source: %{name}-%{version}.tgz Source: %{name}-%{version}.tgz
@ -231,6 +231,9 @@ rm -rf %{buildroot}
%{ruby_sitearch}/selinux.so %{ruby_sitearch}/selinux.so
%changelog %changelog
* Wed Sep 14 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.5-5
- Switch to use ":" as prefix separator rather then ";"
* Thu Sep 8 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.1.5-4 * Thu Sep 8 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.1.5-4
- Avoid unnecessary shell invocation in %%post. - Avoid unnecessary shell invocation in %%post.