diff options
| author | Richard Haines <richard_c_haines@btinternet.com> | 2018-01-10 14:12:38 +0000 |
|---|---|---|
| committer | William Roberts <william.c.roberts@intel.com> | 2018-01-13 10:49:13 -0800 |
| commit | 8bcee8442197c91e10e7d5a54b409866dc2753f1 (patch) | |
| tree | a2f49c02204f350683e9ba6233df01cdf9c39682 /libselinux/man | |
| parent | 5e81672ca0adaf4695f2634e063a30543a4800a9 (diff) | |
| download | android_external_selinux-8bcee8442197c91e10e7d5a54b409866dc2753f1.tar.gz android_external_selinux-8bcee8442197c91e10e7d5a54b409866dc2753f1.tar.bz2 android_external_selinux-8bcee8442197c91e10e7d5a54b409866dc2753f1.zip | |
libselinux: Correct manpages regarding removable_context
The selabel_media(5) man page incorrectly stated that the
removable_context(5) would be read if an selabel_lookup(3)
failed. Correct the man pages that fixes [1].
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1395621
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
Diffstat (limited to 'libselinux/man')
| -rw-r--r-- | libselinux/man/man5/removable_context.5 | 5 | ||||
| -rw-r--r-- | libselinux/man/man5/selabel_media.5 | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libselinux/man/man5/removable_context.5 b/libselinux/man/man5/removable_context.5 index 60aaa938..f16e8bdc 100644 --- a/libselinux/man/man5/removable_context.5 +++ b/libselinux/man/man5/removable_context.5 @@ -3,8 +3,7 @@ removable_context \- The SELinux removable devices context configuration file . .SH "DESCRIPTION" -This file contains the default label that should be used for removable devices that are not defined in the \fImedia\fR file (that is described in -.BR selabel_media "(5)). " +This file contains the default label that should be used for removable devices. .sp .BR selinux_removable_context_path "(3) " will return the active policy path to this file. The default removable context file is: @@ -34,4 +33,4 @@ A user, role, type and optional range (for MCS/MLS) separated by colons (:) that system_u:object_r:removable_t:s0 . .SH "SEE ALSO" -.BR selinux "(8), " selinux_removable_context_path "(3), " selabel_media "(5), " selinux_config "(5) " +.BR selinux "(8), " selinux_removable_context_path "(3), " selinux_config "(5) " diff --git a/libselinux/man/man5/selabel_media.5 b/libselinux/man/man5/selabel_media.5 index 395ed0e7..b7c28e32 100644 --- a/libselinux/man/man5/selabel_media.5 +++ b/libselinux/man/man5/selabel_media.5 @@ -52,8 +52,6 @@ The default media contexts file is: .RE .sp Where \fI{SELINUXTYPE}\fR is the entry from the selinux configuration file \fIconfig\fR (see \fBselinux_config\fR(5)). -.sp -Should there not be a valid entry in the \fImedia\fR file, then the default \fIremovable_context\fR file will be read (see \fBremovable_context\fR(5)). . .SH "FILE FORMAT" Each line within the \fImedia\fR file is as follows: @@ -90,4 +88,4 @@ this is not set, then it is possible for an invalid context to be returned. .SH "SEE ALSO" .ad l .nh -.BR selinux "(8), " selabel_open "(3), " selabel_lookup "(3), " selabel_stats "(3), " selabel_close "(3), " selinux_set_callback "(3), " selinux_media_context_path "(3), " freecon "(3), " selinux_config "(5), " removable_context "(5) " +.BR selinux "(8), " selabel_open "(3), " selabel_lookup "(3), " selabel_stats "(3), " selabel_close "(3), " selinux_set_callback "(3), " selinux_media_context_path "(3), " freecon "(3), " selinux_config "(5) " |