diff options
| author | Michael Kerrisk (man-pages) <mtk.manpages@gmail.com> | 2020-07-20 11:13:27 +0200 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2020-07-20 08:06:58 -0700 |
| commit | 598002f16f7b9ad8428f84a780ab7bca22b19fe0 (patch) | |
| tree | ac14de6bc1bbfc4d73284e382713f8467076c7c9 | |
| parent | 0be61375ddb3f94f975742164cfcf1bfda3f533b (diff) | |
| download | libcap2-598002f16f7b9ad8428f84a780ab7bca22b19fe0.tar.gz | |
Manual pages: cap_get_proc.3, capsh.1: Use "UID" and "GID" consistently
Replace terms such as "uid" and "use-id" with the more conventional
abbreviation UID. Similarly for GID.
Signed-off-by: Michael Kerrisk (man-pages) <mtk.manpages@gmail.com>
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
| -rw-r--r-- | doc/cap_get_proc.3 | 2 | ||||
| -rw-r--r-- | doc/capsh.1 | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/cap_get_proc.3 b/doc/cap_get_proc.3 index 40475fd..74e5e8c 100644 --- a/doc/cap_get_proc.3 +++ b/doc/cap_get_proc.3 @@ -349,7 +349,7 @@ effective capabilities for the caller: .fi Alternatively, to completely drop privilege in a program launched -setuid-root but wanting to run as a specific user-id etc. in such a +setuid-root but wanting to run as a specific user ID etc. in such a way that neither it, nor any of its children can acquire privilege again: .nf diff --git a/doc/capsh.1 b/doc/capsh.1 index f19a3ea..d124889 100644 --- a/doc/capsh.1 +++ b/doc/capsh.1 @@ -67,7 +67,7 @@ in its effective set. .TP .BI \-\-user= username Assume the identity of the named user. That is, look up the user's -.IR uid " and " gid +UID and GID with .BR getpwuid (3) and their group memberships with @@ -97,7 +97,7 @@ or exit with a status 1. .TP .BI \-\-uid= id Force all -.B uid +UID values to equal .I id using the @@ -108,18 +108,19 @@ effective set. .BR \-\-cap\-uid= <uid> use the .BR cap_setuid (3) -function to set the uid of the current process. This performs all -preparations for setting the uid without dropping capabilities in the +function to set the UID of the current process. This performs all +preparations for setting the UID without dropping capabilities in the process. Following this command the prevailing effective capabilities will be lowered. .TP .BI \-\-is\-uid= <id> Exit with status 1 unless the current -.IR uid " equals " <id> . +UID equals +.IR <id> . .TP .BI \-\-gid= <id> Force all -.B gid +GID values to equal .I id using the @@ -128,7 +129,8 @@ system call. .TP .BI \-\-is\-gid= <id> Exit with status 1 unless the current -.IR gid " equals " <id> . +GIQ equals +.IR <id> . .TP .BI \-\-groups= <gid-list> Set the supplementary groups to the numerical list provided. The @@ -142,7 +144,7 @@ for a more convenient way of doing this. In a non-pure capability mode, the kernel provides liberal privilege to the super-user. However, it is normally the case that when the super-user changes -.I uid +UID to some lesser user, then capabilities are dropped. For these situations, the kernel can permit the process to retain its capabilities after a |