New upstream version 4.9upstream/4.9

12 files changed, 82 insertions, 53 deletions

diff --git a/man/zh_CN/man1/chage.1 b/man/zh_CN/man1/chage.1
index 0eae23d3..1f02ba8b 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHAGE" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "CHAGE" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,13 +45,30 @@ command are:
 .PP
 \fB\-d\fR, \fB\-\-lastday\fR\ \&\fILAST_DAY\fR
 .RS 4
-Set the number of days since January 1st, 1970 when the password was last changed\&. The date may also be expressed in the format YYYY\-MM\-DD (or the format more commonly used in your area)\&.
+Set the number of days since January 1st, 1970 when the password was last changed\&. The date may also be expressed in the format YYYY\-MM\-DD (or the format more commonly used in your area)\&. If the
+\fILAST_DAY\fR
+is set to
+\fI0\fR
+the user is forced to change his password on the next log on\&.
 .RE
 .PP
 \fB\-E\fR, \fB\-\-expiredate\fR\ \&\fIEXPIRE_DATE\fR
 .RS 4
 Set the date or number of days since January 1, 1970 on which the user\*(Aqs account will no longer be accessible\&. The date may also be expressed in the format YYYY\-MM\-DD (or the format more commonly used in your area)\&. A user whose account is locked must contact the system administrator before being able to use the system again\&.
 .sp
+For example the following can be used to set an account to expire in 180 days:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+	    chage \-E $(date \-d +180days +%Y\-%m\-%d)
+	  
+.fi
+.if n \{\
+.RE
+.\}
+.sp
 Passing the number
 \fI\-1\fR
 as the
@@ -61,7 +78,7 @@ will remove an account expiration date\&.
 .PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
-现实帮助信息并退出。
+显示帮助信息并退出。
 .RE
 .PP
 \fB\-i\fR, \fB\-\-iso8601\fR
@@ -84,7 +101,7 @@ will remove an account\*(Aqs inactivity\&.
 .PP
 \fB\-l\fR, \fB\-\-list\fR
 .RS 4
-现实账户年龄信息。
+显示账户年龄信息。
 .RE
 .PP
 \fB\-m\fR, \fB\-\-mindays\fR\ \&\fIMIN_DAYS\fR
@@ -137,6 +154,14 @@ The
 \fBchage\fR
 program requires a shadow password file to be available\&.
 .PP
+The chage program will report only the information from the shadow password file\&. This implies that configuration from other sources (e\&.g\&. LDAP or empty password hash field from the passwd file) that affect the user\*(Aqs login will not be shown in the chage output\&.
+.PP
+The
+\fBchage\fR
+program will also not report any inconsistency between the shadow and passwd files (e\&.g\&. missing x in the passwd file)\&. The
+\fBpwck\fR
+can be used to check for this kind of inconsistencies\&.
+.PP
 The
 \fBchage\fR
 command is restricted to the root user, except for the
diff --git a/man/zh_CN/man1/chfn.1 b/man/zh_CN/man1/chfn.1
index c0a2f2ed..68c8dd96 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHFN" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "CHFN" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -85,7 +85,7 @@ directory\&.
 .PP
 \fB\-u\fR, \fB\-\-help\fR
 .RS 4
-现实帮助信息并退出。
+显示帮助信息并退出。
 .RE
 .PP
 \fB\-w\fR, \fB\-\-work\-phone\fR\ \&\fIWORK_PHONE\fR
diff --git a/man/zh_CN/man1/chsh.1 b/man/zh_CN/man1/chsh.1
index e9147a74..7697eafd 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHSH" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "CHSH" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ command are:
 .PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
-现实帮助信息并退出。
+显示帮助信息并退出。
 .RE
 .PP
 \fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
diff --git a/man/zh_CN/man1/expiry.1 b/man/zh_CN/man1/expiry.1
index afd3255c..b8efeba6 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "EXPIRY" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "EXPIRY" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,7 +55,7 @@ Check the password expiration of the current user\&.
 .PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
-现实帮助信息并退出。
+显示帮助信息并退出。
 .RE
 .SH "文件"
 .PP
diff --git a/man/zh_CN/man1/gpasswd.1 b/man/zh_CN/man1/gpasswd.1
index 3b4f3515..e4d93d05 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "GPASSWD" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "GPASSWD" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -89,7 +89,7 @@ from the named
 .PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
-现实帮助信息并退出。
+显示帮助信息并退出。
 .RE
 .PP
 \fB\-Q\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
@@ -147,7 +147,9 @@ change the behavior of this tool:
 It can take one of these values:
 \fIDES\fR
 (default),
-\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
+\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&. MD5 and DES should not be used for new hashes, see
+crypt(5)
+for recommendations\&.
 .sp
 Note: this parameter overrides the
 \fBMD5_CRYPT_ENAB\fR
@@ -196,7 +198,7 @@ or
 .sp
 使用很多轮转，会让暴力破解更加困难。但是需要注意，认证用户时也会需要更多的 CPU 资源。
 .sp
-如果没有指定，libc 会选择默认的轮转数(5000)。
+If not specified, the libc will choose the default number of rounds (5000), which is orders of magnitude too low for modern hardware\&.
 .sp
 值必须在 1000 \- 999,999,999 之间。
 .sp
diff --git a/man/zh_CN/man1/groups.1 b/man/zh_CN/man1/groups.1
index 4b7982a9..6f288579 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "GROUPS" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "GROUPS" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "名称"
-groups \- 现实当前组名
+groups \- 显示当前组名
 .SH "大纲"
 .HP \w'\fBgroups\fR\ 'u
 \fBgroups\fR [\fI用户\fR]
diff --git a/man/zh_CN/man1/id.1 b/man/zh_CN/man1/id.1
index 637c0d55..ede76426 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "ID" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "ID" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/login.1 b/man/zh_CN/man1/login.1
index 7ecfde7b..4d6fdefd 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGIN" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "LOGIN" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -263,7 +263,7 @@ If defined, this file can inhibit all the usual chatter during the login sequenc
 .PP
 \fBISSUE_FILE\fR (string)
 .RS 4
-如果定义了，此文件将在每次的登录提示之前现实。
+如果定义了，此文件将在每次的登录提示之前显示。
 .RE
 .PP
 \fBKILLCHAR\fR (number)
@@ -311,7 +311,7 @@ If the string contains
 .PP
 \fBMAIL_CHECK_ENAB\fR (boolean)
 .RS 4
-启用登录时检查和现实邮箱状态。
+启用登录时检查和显示邮箱状态。
 .sp
 如果 shell 的启动文件已经检查了邮件("mailx \-e" 或者其它同功能的工具)，您应该禁用它。
 .RE
@@ -467,7 +467,7 @@ System message of the day file\&.
 .PP
 $HOME/\&.hushlogin
 .RS 4
-阻止现实系统信息。
+阻止显示系统信息。
 .RE
 .PP
 /etc/login\&.defs
diff --git a/man/zh_CN/man1/newgrp.1 b/man/zh_CN/man1/newgrp.1
index c696e0c4..520cf1ee 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "NEWGRP" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "NEWGRP" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/passwd.1 b/man/zh_CN/man1/passwd.1
index 5d934a10..3c9c10ed 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "PASSWD" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "PASSWD" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@ and causes show status for all users\&.
 .PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
-现实帮助信息并退出。
+显示帮助信息并退出。
 .RE
 .PP
 \fB\-i\fR, \fB\-\-inactive\fR\ \&\fIINACTIVE\fR
@@ -223,7 +223,9 @@ change the behavior of this tool:
 It can take one of these values:
 \fIDES\fR
 (default),
-\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
+\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&. MD5 and DES should not be used for new hashes, see
+crypt(5)
+for recommendations\&.
 .sp
 Note: this parameter overrides the
 \fBMD5_CRYPT_ENAB\fR
@@ -282,7 +284,7 @@ or
 .sp
 使用很多轮转，会让暴力破解更加困难。但是需要注意，认证用户时也会需要更多的 CPU 资源。
 .sp
-如果没有指定，libc 会选择默认的轮转数(5000)。
+If not specified, the libc will choose the default number of rounds (5000), which is orders of magnitude too low for modern hardware\&.
 .sp
 值必须在 1000 \- 999,999,999 之间。
 .sp
diff --git a/man/zh_CN/man1/sg.1 b/man/zh_CN/man1/sg.1
index bda6a5ec..ea503789 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "SG" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "SG" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/su.1 b/man/zh_CN/man1/su.1
index c4d29c1d..8d49ec7e 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 v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-01-23
+.\"      Date: 2021-07-22
 .\"    Manual: 用户命令
-.\"    Source: shadow-utils 4.8.1
+.\"    Source: shadow-utils 4.9
 .\"  Language: Chinese Simplified
 .\"
-.TH "SU" "1" "2020-01-23" "shadow\-utils 4\&.8\&.1" "用户命令"
+.TH "SU" "1" "2021-07-22" "shadow\-utils 4\&.9" "用户命令"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -305,7 +305,7 @@ If the string contains
 .PP
 \fBMAIL_CHECK_ENAB\fR (boolean)
 .RS 4
-启用登录时检查和现实邮箱状态。
+启用登录时检查和显示邮箱状态。
 .sp
 如果 shell 的启动文件已经检查了邮件("mailx \-e" 或者其它同功能的工具)，您应该禁用它。
 .RE