[Pkg-shadow-devel] Bug#300268: /usr/share/man/man5/passwd.5.gz contains inaccurate information

[Nicolas François]

--3MwIy2ne0vdjdPXF
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello Tomasz,

On Fri, Mar 18, 2005 at 09:43:29PM +0100, Tomasz K=C5=82oczko wrote:
> English isn't my native language so it will be good if someone will ver=
ify
> below patch before I'll commit this to shadow CVS tree.
>=20
> --- passwd.5    11 Dec 2004 20:05:01 -0000      1.13
> +++ passwd.5    18 Mar 2005 20:25:48 -0000
> @@ -48,9 +48,13 @@
>  .PP
>  The password field may not be filled if shadow passwords have been ena=
bled.
>  If shadow passwords are being used, the encrypted password will be fou=
nd in
> -\fI/etc/shadow\fR. The encrypted password consists of 13 characters fr=
om the
> -64 character alphabet a thru z, A thru Z, 0 thru 9, \. and /. Refer to
> -\fBcrypt\fR(3) for details on how this string is interpreted.
> +\fI/etc/shadow\fR. The encrypted password consists of characters from =
the
> +64 character alphabet a thru z, A thru Z, 0 thru 9, \. and /. Optional=
y it
> +can start with "$" character. This mean encrypted password was generat=
ed
> +using another (not DES) algorithm. For example if it start with "$1$" =
it means
> +MD5-based algorithm was used.
> +.PP
> +Refer to \fBcrypt\fR(3) for details on how this string is interpreted.
>  .PP
>  The comment field is used by various system utilities, such as
>  \fBfinger\fR(1). Three additional values may be present in the comment=
 (END)

English is neither my native language, so the followings are only proposa=
ls:

s/Optionaly/Optionally/
s/64 character/64 characters/

I would also write "it can start with a "$" character."
"This means the encrypted password..."
and "For example if it starts ..."

BTW, the same correction could be applied to shadow.5


An updated patch is attached.

Best Regards,
--=20
Nekral

--3MwIy2ne0vdjdPXF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="shadow.patch"

--- passwd.5.orig	2005-03-18 22:47:25.000000000 +0100
+++ passwd.5	2005-03-18 22:52:51.000000000 +0100
@@ -48,9 +48,13 @@
 .PP
 The password field may not be filled if shadow passwords have been enabled.
 If shadow passwords are being used, the encrypted password will be found in
-\fI/etc/shadow\fR. The encrypted password consists of 13 characters from the
-64 character alphabet a thru z, A thru Z, 0 thru 9, \. and /. Refer to
-\fBcrypt\fR(3) for details on how this string is interpreted.
+\fI/etc/shadow\fR. The encrypted password consists of characters from the
+64 characters alphabet a thru z, A thru Z, 0 thru 9, \. and /. Optionally it
+can start with a "$" character. This means the encrypted password was generated
+using another (not DES) algorithm. For example if it starts with "$1$" it means
+the MD5-based algorithm was used.
+.PP
+Refer to \fBcrypt\fR(3) for details on how this string is interpreted.
 .PP
 The comment field is used by various system utilities, such as
 \fBfinger\fR(1). Three additional values may be present in the comment
--- shadow.5.orig	2005-03-18 22:54:09.000000000 +0100
+++ shadow.5	2005-03-18 22:59:08.000000000 +0100
@@ -51,9 +51,12 @@
 A reserved field
 .PP
 The password field must be filled. The encryped password consists of 13 to
-24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9,
-\&\. and /. Refer to \fBcrypt\fR(3) for details on how this string is
-interpreted.
+24 characters from the 64 characters alphabet a thru z, A thru Z, 0 thru 9,
+\&\. and /. Optionally it can start with a "$" character. This means the
+encrypted password was generated using another (not DES) algorithm. For
+example if it starts with "$1$" it means the MD5-based algorithm was used.
+.PP
+Refer to \fBcrypt\fR(3) for details on how this string is interpreted.
 .PP
 The date of the last password change is given as the number of days since
 Jan 1, 1970. The password may not be changed again until the proper number

--3MwIy2ne0vdjdPXF--