summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-01-24 10:11:16 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2018-01-24 10:11:16 (GMT)
commit8e230e1eb3d38ad557b5dc5c31166afa35c01ff3 (patch)
tree1756c08ea71d38d47a8f9efedaed69f664137cc8 /Include
parent6abbf14a876ee1e04d1493bb27025f2f0aa56430 (diff)
downloadcpython-8e230e1eb3d38ad557b5dc5c31166afa35c01ff3.zip
cpython-8e230e1eb3d38ad557b5dc5c31166afa35c01ff3.tar.gz
cpython-8e230e1eb3d38ad557b5dc5c31166afa35c01ff3.tar.bz2
bpo-32635: Fix a segfault when importing the crypt module with libxcrypt. (GH-5284) (#5296)
glibc is deprecating libcrypt in favor of libxcrypt, however python assumes that crypt.h will always be included. This change makes the header inclusion explicit when libxcrypt is present on the system. (cherry picked from commit e768c86ef442ef89004089a8a34ce5909ffb90f2)
Diffstat (limited to 'Include')
-rw-r--r--Include/Python.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Include/Python.h b/Include/Python.h
index 4c7c9a4..6177bad 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -35,6 +35,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
/* For size_t? */
#ifdef HAVE_STDDEF_H