summaryrefslogtreecommitdiffstats
path: root/Doc/library/spwd.rst
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-11-04 00:54:05 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-11-04 00:54:05 (GMT)
commitbd90d09dd0203c7a277d4c973c136063e90f04f0 (patch)
tree9c6f57e16496b8b8df5c952058e0798da6460f2f /Doc/library/spwd.rst
parented4500fb66fd17ba3f28434772a3e8fc1f021866 (diff)
downloadcpython-bd90d09dd0203c7a277d4c973c136063e90f04f0.zip
cpython-bd90d09dd0203c7a277d4c973c136063e90f04f0.tar.gz
cpython-bd90d09dd0203c7a277d4c973c136063e90f04f0.tar.bz2
#18678: Correct names of spwd struct members.
The old names (sp_nam and sp_pwd) are kept for backward compatibility. Since this is a long standing bug that hasn't caused any real-world problems, I'm not backporting it. However, it is worth fixing because the corrected names match the documentation, and more importantly now match the C struct, just like the other struct members. Patch by Vajrasky Kok.
Diffstat (limited to 'Doc/library/spwd.rst')
-rw-r--r--Doc/library/spwd.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/spwd.rst b/Doc/library/spwd.rst
index add611f..58be78f 100644
--- a/Doc/library/spwd.rst
+++ b/Doc/library/spwd.rst
@@ -19,9 +19,9 @@ below, see ``<shadow.h>``):
+-------+---------------+---------------------------------+
| Index | Attribute | Meaning |
+=======+===============+=================================+
-| 0 | ``sp_nam`` | Login name |
+| 0 | ``sp_namp`` | Login name |
+-------+---------------+---------------------------------+
-| 1 | ``sp_pwd`` | Encrypted password |
+| 1 | ``sp_pwdp`` | Encrypted password |
+-------+---------------+---------------------------------+
| 2 | ``sp_lstchg`` | Date of last change |
+-------+---------------+---------------------------------+
@@ -36,15 +36,15 @@ below, see ``<shadow.h>``):
+-------+---------------+---------------------------------+
| 6 | ``sp_inact`` | Number of days after password |
| | | expires until account is |
-| | | blocked |
+| | | disabled |
+-------+---------------+---------------------------------+
| 7 | ``sp_expire`` | Number of days since 1970-01-01 |
-| | | until account is disabled |
+| | | when account expires |
+-------+---------------+---------------------------------+
| 8 | ``sp_flag`` | Reserved |
+-------+---------------+---------------------------------+
-The sp_nam and sp_pwd items are strings, all others are integers.
+The sp_namp and sp_pwdp items are strings, all others are integers.
:exc:`KeyError` is raised if the entry asked for cannot be found.
The following functions are defined: