aboutsummaryrefslogtreecommitdiffstats
path: root/man7
diff options
context:
space:
mode:
Diffstat (limited to 'man7')
-rw-r--r--man7/capabilities.78
-rw-r--r--man7/pthreads.72
2 files changed, 5 insertions, 5 deletions
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index 7ab9f21de3..16887e6a69 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -272,7 +272,7 @@ the capabilities that the process may assume
(i.e., a limiting superset for the effective and inheritable sets).
If a process drops a capability from its permitted set,
it can never re-acquire that capability (unless it execs a
-set-UID-root program).
+set-user-ID-root program).
.TP
.IR inheritable :
the capabilities preserved across an
@@ -281,7 +281,7 @@ the capabilities preserved across an
In the current implementation, a process is granted all permitted and
effective capabilities (subject to the operation of the
capability bounding set described below)
-when it execs a set-UID-root program,
+when it execs a set-user-ID-root program,
or if a process with a real UID of zero execs a new program.
.PP
A child created via
@@ -360,12 +360,12 @@ support file capability sets, during an exec:
.IP 1. 4
All three file capability sets are initially assumed to be cleared.
.IP 2. 4
-If a set-UID-root program is being execed,
+If a set-user-ID-root program is being execed,
or the real user ID of the process is 0 (root)
then the file allowed and forced sets are defined to be all ones
(i.e., all capabilities set).
.IP 3. 4
-If a set-UID-root program is being executed,
+If a set-user-ID-root program is being executed,
then the file effective set is defined to be all ones.
.PP
During an exec, the kernel calculates the new capabilities of
diff --git a/man7/pthreads.7 b/man7/pthreads.7
index 895edc9d35..e37afd8e51 100644
--- a/man7/pthreads.7
+++ b/man7/pthreads.7
@@ -191,7 +191,7 @@ However, the resulting process has the same PID as the thread that called
it should have the same PID as the main thread.
.IP \- 3
Threads do not share user and group IDs.
-This can cause complications with set-UID programs and
+This can cause complications with set-user-ID programs and
can cause failures in Pthreads functions if an application
changes its credentials using
.BR seteuid (2)