emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #191 from topimiettinen/sync-passwd-5-and-shadow-5

Browse Source 
man: sync and reorder password field descriptions
This commit is contained in:
Christian Brauner 2019-11-16 15:06:03 +01:00 committed by GitHub
commit b49712ed32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
man/passwd.5.xml
View File

@ -98,24 +98,43 @@
</itemizedlist> </itemizedlist>
<para> <para>
The encrypted password field may be blank, in which case no password If the <emphasis>password</emphasis> field is a lower-case
is required to authenticate as the specified login name. However, <quote>x</quote>, then the encrypted password is actually stored in the
some applications which read the <filename>/etc/passwd</filename> file
may decide not to permit <emphasis>any</emphasis> access at all if the
<emphasis>password</emphasis> field is blank. If the
<emphasis>password</emphasis> field is a lower-case <quote>x</quote>,
then the encrypted password is actually stored in the
<citerefentry><refentrytitle>shadow</refentrytitle> <citerefentry><refentrytitle>shadow</refentrytitle>
<manvolnum>5</manvolnum></citerefentry> file instead; there <manvolnum>5</manvolnum></citerefentry> file instead; there
<emphasis>must</emphasis> be a corresponding line in the <emphasis>must</emphasis> be a corresponding line in the
<filename>/etc/shadow</filename> file, or else the user account is invalid. <filename>/etc/shadow</filename> file, or else the user account is invalid.
If the <emphasis>password</emphasis> field is any other string, then
it will be treated as an encrypted password, as specified by
<citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry>.
</para> </para>
<para>
The encrypted <emphasis>password</emphasis> field may be empty,
in which case no password is required to authenticate as the
specified login name. However, some applications which read the
<filename>/etc/passwd</filename> file may decide not to permit
<emphasis>any</emphasis> access at all if the
<emphasis>password</emphasis> field is blank.
</para>
<para>
A <emphasis>password</emphasis> field which starts with an
exclamation mark means that the password is locked. The
remaining characters on the line represent the
<emphasis>password</emphasis> field before the password was
locked.
</para>
<para>
Refer to <citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry> for details on how
this string is interpreted.
</para>
<para>
If the password field contains some string that is not a valid
result of <citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry>, for instance ! or *,
the user will not be able to use a unix password to log in
(but the user may log in the system by other means).
</para>
<para> <para>
The comment field is used by various system utilities, such as The comment field is used by various system utilities, such as
<citerefentry><refentrytitle>finger</refentrytitle> <citerefentry><refentrytitle>finger</refentrytitle>

24
man/shadow.5.xml
View File

@ -95,18 +95,6 @@
<varlistentry> <varlistentry>
<term><emphasis role="bold">encrypted password</emphasis></term> <term><emphasis role="bold">encrypted password</emphasis></term>
<listitem> <listitem>
<para>
Refer to <citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry> for details on how
this string is interpreted.
</para>
<para>
If the password field contains some string that is not a valid
result of <citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry>, for instance ! or *,
the user will not be able to use a unix password to log in
(but the user may log in the system by other means).
</para>
<para> <para>
This field may be empty, in which case no passwords are This field may be empty, in which case no passwords are
required to authenticate as the specified login name. required to authenticate as the specified login name.
@ -120,6 +108,18 @@
line represent the password field before the password was line represent the password field before the password was
locked. locked.
</para> </para>
<para>
Refer to <citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry> for details on how
this string is interpreted.
</para>
<para>
If the password field contains some string that is not a valid
result of <citerefentry><refentrytitle>crypt</refentrytitle>
<manvolnum>3</manvolnum></citerefentry>, for instance ! or *,
the user will not be able to use a unix password to log in
(but the user may log in the system by other means).
</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>