From b6b00dd55e035bfbe311a527b567962ffa77ee43 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jun 2024 18:18:37 +0200 Subject: Merging upstream version 1:4.15.2. Signed-off-by: Daniel Baumann --- man/zh_CN/man1/chage.1 | 16 ++++++++---- man/zh_CN/man1/chfn.1 | 10 ++++---- man/zh_CN/man1/chsh.1 | 16 ++++++++---- man/zh_CN/man1/expiry.1 | 10 ++++---- man/zh_CN/man1/gpasswd.1 | 10 ++++---- man/zh_CN/man1/groups.1 | 10 ++++---- man/zh_CN/man1/id.1 | 8 +++--- man/zh_CN/man1/login.1 | 12 ++++----- man/zh_CN/man1/newgrp.1 | 8 +++--- man/zh_CN/man1/passwd.1 | 65 +++++++++++++++++------------------------------- man/zh_CN/man1/sg.1 | 8 +++--- man/zh_CN/man1/su.1 | 10 ++++---- 12 files changed, 88 insertions(+), 95 deletions(-) (limited to 'man/zh_CN/man1') diff --git a/man/zh_CN/man1/chage.1 b/man/zh_CN/man1/chage.1 index 1383387..88d574a 100644 --- a/man/zh_CN/man1/chage.1 +++ b/man/zh_CN/man1/chage.1 @@ -2,12 +2,12 @@ .\" Title: chage .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "CHAGE" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "CHAGE" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ chage \- 更改用户密码过期信息 .SH "大纲" .HP \w'\fBchage\fR\ 'u -\fBchage\fR [\fI选项\fR] \fI登录\fR +\fBchage\fR [\fIoptions\fR] \fILOGIN\fR .SH "描述" .PP The @@ -136,6 +136,12 @@ directory and use the configuration files from the directory\&. Only absolute paths are supported\&. .RE .PP +\fB\-P\fR, \fB\-\-prefix\fR\ \&\fIPREFIX_DIR\fR +.RS 4 +Apply changes to configuration files under the root filesystem found under the directory +\fIPREFIX_DIR\fR\&. This option does not chroot and is intended for preparing a cross\-compilation target\&. Some limitations: NIS and LDAP users/groups are not verified\&. PAM authentication is using the host files\&. No SELINUX support\&. +.RE +.PP \fB\-W\fR, \fB\-\-warndays\fR\ \&\fIWARN_DAYS\fR .RS 4 Set the number of days of warning before a password change is required\&. The diff --git a/man/zh_CN/man1/chfn.1 b/man/zh_CN/man1/chfn.1 index cc5b4bf..17ed971 100644 --- a/man/zh_CN/man1/chfn.1 +++ b/man/zh_CN/man1/chfn.1 @@ -2,12 +2,12 @@ .\" Title: chfn .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "CHFN" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "CHFN" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ chfn \- 更改真名和信息 .SH "大纲" .HP \w'\fBchfn\fR\ 'u -\fBchfn\fR [\fI选项\fR] [\fI登录\fR] +\fBchfn\fR [\fIoptions\fR] [\fILOGIN\fR] .SH "描述" .PP The diff --git a/man/zh_CN/man1/chsh.1 b/man/zh_CN/man1/chsh.1 index f81758c..52c6dee 100644 --- a/man/zh_CN/man1/chsh.1 +++ b/man/zh_CN/man1/chsh.1 @@ -2,12 +2,12 @@ .\" Title: chsh .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "CHSH" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "CHSH" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ chsh \- 更改登录 shell .SH "大纲" .HP \w'\fBchsh\fR\ 'u -\fBchsh\fR [\fI选项\fR] [\fI登录\fR] +\fBchsh\fR [\fIoptions\fR] [\fILOGIN\fR] .SH "描述" .PP The @@ -77,6 +77,12 @@ The only restriction placed on the login shell is that the command name must be in /etc/shells is discouraged since accidentally changing to a restricted shell would prevent the user from ever changing her login shell back to its original value\&. +.PP +For this reason, placing +/bin/rsh +in +/etc/shells +is discouraged since accidentally changing to a restricted shell would prevent the user from ever changing her login shell back to its original value\&. .SH "配置文件" .PP The following configuration variables in diff --git a/man/zh_CN/man1/expiry.1 b/man/zh_CN/man1/expiry.1 index 3ebd733..e4b528b 100644 --- a/man/zh_CN/man1/expiry.1 +++ b/man/zh_CN/man1/expiry.1 @@ -2,12 +2,12 @@ .\" Title: expiry .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "EXPIRY" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "EXPIRY" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ expiry \- check and enforce password expiration policy .SH "大纲" .HP \w'\fBexpiry\fR\ 'u -\fBexpiry\fR \fI选项\fR +\fBexpiry\fR \fIoption\fR .SH "描述" .PP The diff --git a/man/zh_CN/man1/gpasswd.1 b/man/zh_CN/man1/gpasswd.1 index 1f4623f..8648209 100644 --- a/man/zh_CN/man1/gpasswd.1 +++ b/man/zh_CN/man1/gpasswd.1 @@ -2,12 +2,12 @@ .\" Title: gpasswd .\" Author: Rafal Maszkowski .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "GPASSWD" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "GPASSWD" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ gpasswd \- administer /etc/group and /etc/gshadow .SH "大纲" .HP \w'\fBgpasswd\fR\ 'u -\fBgpasswd\fR [\fI选项\fR] \fIgroup\fR +\fBgpasswd\fR [\fIoption\fR] \fIgroup\fR .SH "描述" .PP The diff --git a/man/zh_CN/man1/groups.1 b/man/zh_CN/man1/groups.1 index 3845897..d7b66f9 100644 --- a/man/zh_CN/man1/groups.1 +++ b/man/zh_CN/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "GROUPS" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "GROUPS" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ groups \- 显示当前组名 .SH "大纲" .HP \w'\fBgroups\fR\ 'u -\fBgroups\fR [\fI用户\fR] +\fBgroups\fR [\fIuser\fR] .SH "描述" .PP The diff --git a/man/zh_CN/man1/id.1 b/man/zh_CN/man1/id.1 index 31ecf86..30f53a7 100644 --- a/man/zh_CN/man1/id.1 +++ b/man/zh_CN/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "ID" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "ID" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/login.1 b/man/zh_CN/man1/login.1 index 5c43d13..03f92b8 100644 --- a/man/zh_CN/man1/login.1 +++ b/man/zh_CN/man1/login.1 @@ -2,12 +2,12 @@ .\" Title: login .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "LOGIN" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "LOGIN" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,9 +31,9 @@ login \- 在系统上启动回话 .SH "大纲" .HP \w'\fBlogin\fR\ 'u -\fBlogin\fR [\-p] [\-h\ \fIhost\fR] [\fI用户名\fR] [\fIENV=VAR\fR...] +\fBlogin\fR [\-p] [\-h\ \fIhost\fR] [\fIusername\fR] [\fIENV=VAR\fR...] .HP \w'\fBlogin\fR\ 'u -\fBlogin\fR [\-p] [\-h\ \fIhost\fR] \-f \fI用户名\fR +\fBlogin\fR [\-p] [\-h\ \fIhost\fR] \-f \fIusername\fR .HP \w'\fBlogin\fR\ 'u \fBlogin\fR [\-p] \-r\ \fIhost\fR .SH "描述" diff --git a/man/zh_CN/man1/newgrp.1 b/man/zh_CN/man1/newgrp.1 index a66be46..f34266c 100644 --- a/man/zh_CN/man1/newgrp.1 +++ b/man/zh_CN/man1/newgrp.1 @@ -2,12 +2,12 @@ .\" Title: newgrp .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "NEWGRP" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "NEWGRP" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/passwd.1 b/man/zh_CN/man1/passwd.1 index 89e0e07..cfc0016 100644 --- a/man/zh_CN/man1/passwd.1 +++ b/man/zh_CN/man1/passwd.1 @@ -2,12 +2,12 @@ .\" Title: passwd .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "PASSWD" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "PASSWD" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ passwd \- 更改用户密码 .SH "大纲" .HP \w'\fBpasswd\fR\ 'u -\fBpasswd\fR [\fI选项\fR] [\fI登录\fR] +\fBpasswd\fR [\fIoptions\fR] [\fILOGIN\fR] .SH "描述" .PP The @@ -49,44 +49,9 @@ refuses to change the password and exits\&. .PP 提示用户输入两次新密码。第二次和第一次进行比较，并且需要相同才能更改密码。 .PP -然后，测试密码的负责程度。一般来讲，密码应该包含 6 到 8 位字符，从下边的一个或多个集合中选择： -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -小写字母 -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -数字 0 到 9 -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -标点符号 -.RE -.PP -Care must be taken not to include the system default erase or kill characters\&. +Then, the password is tested for complexity\&. \fBpasswd\fR -will reject any password which is not suitably complex\&. +will reject any password which is not suitably complex\&. Care must be taken not to include the system default erase or kill characters\&. .SS "关于用户密码的提示" .PP The security of a password depends upon the strength of the encryption algorithm and the size of the key space\&. The legacy @@ -96,6 +61,8 @@ System encryption method is based on the NBS DES algorithm\&. More recent method .PP 由于粗心地或处理选择密码，会危及密码的安全。由于这个原因，您不应该选择出现在词典中或者必须要写下来才能记住的密码。密码也不应该是一个名字、许可证号、生日或者街道号。所有这些可以用于猜测来损害系统安全。 .PP +As a general guideline, passwords should be long and random\&. It\*(Aqs fine to use simple character sets, such as passwords consisting only of lowercase letters, if that helps memorizing longer passwords\&. For a password consisting only of lowercase English letters randomly chosen, and a length of 32, there are 26^32 (approximately 2^150) different possible combinations\&. Being an exponential equation, it\*(Aqs apparent that the exponent (the length) is more important than the base (the size of the character set)\&. +.PP You can find advice on how to choose a strong password on http://en\&.wikipedia\&.org/wiki/Password_strength .SH "选项" .PP @@ -175,6 +142,12 @@ directory and use the configuration files from the directory\&. Only absolute paths are supported\&. .RE .PP +\fB\-P\fR, \fB\-\-prefix\fR\ \&\fIPREFIX_DIR\fR +.RS 4 +Apply changes to configuration files under the root filesystem found under the directory +\fIPREFIX_DIR\fR\&. This option does not chroot and is intended for preparing a cross\-compilation target\&. Some limitations: NIS and LDAP users/groups are not verified\&. PAM authentication is using the host files\&. No SELINUX support\&. +.RE +.PP \fB\-S\fR, \fB\-\-status\fR .RS 4 显示账户状态信息。状态信息包含 7 个字段。首个字段是用户的登录名，第二个字段表示用户账户是否已经锁定密码(L)、没有密码 (NP)或者密码可用(P)，第三个字段给出最后一次更改密码的日期。接下来的四个字段分别是密码的最小年龄、最大年龄、警告期和禁用期。这些年龄以天为单位计算。 @@ -205,6 +178,11 @@ as \fIMAX_DAYS\fR will remove checking a password\*(Aqs validity\&. .RE +.PP +\fB\-s\fR, \fB\-\-stdin\fR +.RS 4 +This option is used to indicate that passwd should read the new password from standard input, which can be a pipe\&. +.RE .SH "CAVEATS" .PP 密码复杂性检查在每台机器间不同。用户应该选择适合的尽量复杂的密码。 @@ -277,7 +255,10 @@ invalid argument to option .SH "参见" .PP \fBchpasswd\fR(8), +\fBmakepasswd\fR(1), \fBpasswd\fR(5), \fBshadow\fR(5), \fBlogin.defs\fR(5), \fBusermod\fR(8)\&. +.PP +The following web page comically (yet correctly) compares the strength of two different methods for choosing a password: "https://xkcd\&.com/936/" diff --git a/man/zh_CN/man1/sg.1 b/man/zh_CN/man1/sg.1 index daae817..163e0b2 100644 --- a/man/zh_CN/man1/sg.1 +++ b/man/zh_CN/man1/sg.1 @@ -2,12 +2,12 @@ .\" Title: sg .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "SG" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "SG" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/su.1 b/man/zh_CN/man1/su.1 index 91a304f..51cde5c 100644 --- a/man/zh_CN/man1/su.1 +++ b/man/zh_CN/man1/su.1 @@ -2,12 +2,12 @@ .\" Title: su .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2022-11-08 -.\" Manual: 用户命令 -.\" Source: shadow-utils 4.13 +.\" Date: 2024-06-21 +.\" Manual: User Commands +.\" Source: shadow-utils 4.15.2 .\" Language: Chinese Simplified .\" -.TH "SU" "1" "2022-11-08" "shadow\-utils 4\&.13" "用户命令" +.TH "SU" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ su \- 更改用户 ID 或成为超级用户 .SH "大纲" .HP \w'\fBsu\fR\ 'u -\fBsu\fR [\fI选项\fR] [\fI\-\fR] [\fI用户名\fR\ [\ \fIargs\fR\ ]] +\fBsu\fR [\fIoptions\fR] [\fI\-\fR] [\fIusername\fR\ [\ \fIargs\fR\ ]] .SH "描述" .PP The -- cgit v1.2.3