aboutsummaryrefslogtreecommitdiffstats
path: root/man7
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2019-02-14 10:47:34 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2019-02-23 22:03:20 +0100
commitbcf7072dbdd1e483885f400884d49e155a56d353 (patch)
treece06c3a92def7cc55dc1183789c98b03ae67c011 /man7
parent049d1a1534ff72645d9e826ebe2948eec7d6e78d (diff)
downloadman-pages-bcf7072dbdd1e483885f400884d49e155a56d353.tar.gz
capabilities.7: Relocate the subsection "Interaction with user namespaces"
This best belongs at the end of the page, after the subsections that already make some mention of user namespaces. Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Diffstat (limited to 'man7')
-rw-r--r--man7/capabilities.711
1 files changed, 6 insertions, 5 deletions
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index d9e51cbe46..686e31996c 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -1583,11 +1583,6 @@ prctl(PR_SET_SECUREBITS,
.in
.\"
.\"
-.SS Interaction with user namespaces
-For further information on the interaction of
-capabilities and user namespaces, see
-.BR user_namespaces (7).
-.\"
.SS Namespaced file capabilities
.\" commit 8db6c34f1dbc8e06aa016a9b829b06902c3e1340
Traditional (i.e., version 2) file capabilities associate
@@ -1634,6 +1629,12 @@ However, capabilities are conferred only if the binary is executed by
a process that resides in a user namespace whose
UID 0 maps to the root user ID that is saved in the extended attribute,
or when executed by a process that resides in a descendant of such a namespace.
+.\"
+.\"
+.SS Interaction with user namespaces
+For further information on the interaction of
+capabilities and user namespaces, see
+.BR user_namespaces (7).
.SH CONFORMING TO
.PP
No standards govern capabilities, but the Linux capability implementation