[libselinux] Fix selabal_open man page to refer to proper selinux_opt structure
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Jan 4 16:03:23 UTC 2012
commit ad8477f7a16f070f93741bdf10670c8524b0813c
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Jan 4 11:03:19 2012 -0500
Fix selabal_open man page to refer to proper selinux_opt structure
libselinux-rhat.patch | 20 +++++++++++++++++---
libselinux.spec | 5 ++++-
2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 54defd3..5edcb6f 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -73,10 +73,24 @@ index cdbb252..b6814ed 100644
frees the memory allocated by a prior call to
.B matchpathcon_init.
diff --git a/libselinux/man/man3/selabel_open.3 b/libselinux/man/man3/selabel_open.3
-index 8674e37..89bb4d3 100644
+index 8674e37..fc5b120 100644
--- a/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,
+@@ -37,8 +37,11 @@ structures of length
+ .ta 4n 16n 24n
+ .nf
+ struct selinux_opt {
+- int type;
+- const char *value;
++ int type;
++ union {
++ const char *value;
++ const char **values;
++ };
+ };
+ .fi
+ .ta
+@@ -66,6 +69,13 @@ A non-null value for this option enables context validation. By default,
is used; a custom validation function can be provided via
.BR selinux_set_callback (3).
Note that an invalid context may not be treated as an error unless it is actually encountered during a lookup operation.
@@ -90,7 +104,7 @@ index 8674e37..89bb4d3 100644
.SH "BACKENDS"
-@@ -99,4 +106,3 @@ Eamon Walsh <ewalsh at tycho.nsa.gov>
+@@ -99,4 +109,3 @@ Eamon Walsh <ewalsh at tycho.nsa.gov>
.BR selabel_stats (3),
.BR selinux_set_callback (3),
.BR selinux (8)
diff --git a/libselinux.spec b/libselinux.spec
index 30cdb3f..afd971d 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -7,7 +7,7 @@
Summary: SELinux library and simple utilities
Name: libselinux
Version: 2.1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Public Domain
Group: System Environment/Libraries
Source: %{name}-%{version}.tgz
@@ -231,6 +231,9 @@ rm -rf %{buildroot}
%{ruby_sitearch}/selinux.so
%changelog
+* Wed Jan 4 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.9-2
+- Fix selabal_open man page to refer to proper selinux_opt structure
+
* Wed Dec 21 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.9-1
-Update to upstream
* Fix setenforce man page to refer to selinux man page
More information about the scm-commits
mailing list