summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2016-04-26 09:43:21 (GMT)
committerStefan Krah <skrah@bytereef.org>2016-04-26 09:43:21 (GMT)
commit45009778aa131b99bc95412390dae232d9f760a7 (patch)
tree074f5f3eb2edd69016d5c2f0c7d3305074579208 /Modules
parentc5c43b8374ced0e889cf90b6e1ff0cc4341dbb3a (diff)
downloadcpython-45009778aa131b99bc95412390dae232d9f760a7.zip
cpython-45009778aa131b99bc95412390dae232d9f760a7.tar.gz
cpython-45009778aa131b99bc95412390dae232d9f760a7.tar.bz2
Issue #20306: Android is the only system that returns NULL for the pw_passwd
field. Rather than cluttering the tests, translate the arguably more correct "None" to an empty string.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/pwdmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index c503256..61be3b2 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -75,7 +75,7 @@ mkpwent(struct passwd *p)
#define SETS(i,val) sets(v, i, val)
SETS(setIndex++, p->pw_name);
-#if defined(HAVE_STRUCT_PASSWD_PW_PASSWD)
+#if defined(HAVE_STRUCT_PASSWD_PW_PASSWD) && !defined(__ANDROID__)
SETS(setIndex++, p->pw_passwd);
#else
SETS(setIndex++, "");