diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-11-04 00:54:05 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-11-04 00:54:05 (GMT) |
| commit | bd90d09dd0203c7a277d4c973c136063e90f04f0 (patch) | |
| tree | 9c6f57e16496b8b8df5c952058e0798da6460f2f /Modules | |
| parent | ed4500fb66fd17ba3f28434772a3e8fc1f021866 (diff) | |
| download | cpython-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 'Modules')
| -rw-r--r-- | Modules/spwdmodule.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c index d06f8ce..68ea1b5 100644 --- a/Modules/spwdmodule.c +++ b/Modules/spwdmodule.c @@ -26,22 +26,24 @@ You have to be root to be able to use this module."); #if defined(HAVE_GETSPNAM) || defined(HAVE_GETSPENT) static PyStructSequence_Field struct_spwd_type_fields[] = { - {"sp_nam", "login name"}, - {"sp_pwd", "encrypted password"}, + {"sp_namp", "login name"}, + {"sp_pwdp", "encrypted password"}, {"sp_lstchg", "date of last change"}, {"sp_min", "min #days between changes"}, {"sp_max", "max #days between changes"}, {"sp_warn", "#days before pw expires to warn user about it"}, - {"sp_inact", "#days after pw expires until account is blocked"}, - {"sp_expire", "#days since 1970-01-01 until account is disabled"}, + {"sp_inact", "#days after pw expires until account is disabled"}, + {"sp_expire", "#days since 1970-01-01 when account expires"}, {"sp_flag", "reserved"}, + {"sp_nam", "login name; deprecated"}, /* Backward compatibility */ + {"sp_pwd", "encrypted password; deprecated"}, /* Backward compatibility */ {0} }; PyDoc_STRVAR(struct_spwd__doc__, "spwd.struct_spwd: Results from getsp*() routines.\n\n\ This object may be accessed either as a 9-tuple of\n\ - (sp_nam,sp_pwd,sp_lstchg,sp_min,sp_max,sp_warn,sp_inact,sp_expire,sp_flag)\n\ + (sp_namp,sp_pwdp,sp_lstchg,sp_min,sp_max,sp_warn,sp_inact,sp_expire,sp_flag)\n\ or via the object attributes as named in the above tuple."); static PyStructSequence_Desc struct_spwd_type_desc = { @@ -86,6 +88,8 @@ static PyObject *mkspent(struct spwd *p) SETI(setIndex++, p->sp_inact); SETI(setIndex++, p->sp_expire); SETI(setIndex++, p->sp_flag); + SETS(setIndex++, p->sp_namp); /* Backward compatibility for sp_nam */ + SETS(setIndex++, p->sp_pwdp); /* Backward compatibility for sp_pwd */ #undef SETS #undef SETI |