From d6fffbf86b58c81ee376fb0ae55abf219f7f0a5d Mon Sep 17 00:00:00 2001 From: Vilnis Termanis Date: Mon, 10 Oct 2016 15:26:29 +0100 Subject: [PATCH] Fix incorrect passing of argument to mysql_options - MYSQL_OPT_SSL_MODE should receive argument as reference - SSL_MODE_DISABLED must be used with MYSQL_OPT_SSL_MODE, not MYSQL_OPT_SSL_ENFORCE - Removed debug printf statement --- src/mysql_capi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mysql_capi.c b/src/mysql_capi.c index 41cece2..7a6e4a8 100644 --- a/src/mysql_capi.c +++ b/src/mysql_capi.c @@ -1107,7 +1107,6 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds) if (ssl_ca || ssl_cert || ssl_key) { #if MYSQL_VERSION_ID > 50703 && MYSQL_VERSION_ID < 50711 - printf(">>>> %d\n", MYSQL_VERSION_ID); { abool= 1; mysql_options(&self->session, MYSQL_OPT_SSL_ENFORCE, (char*)&abool); @@ -1115,7 +1114,8 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds) #endif #if MYSQL_VERSION_ID >= 50711 { - mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_REQUIRED); + tmp_uint= SSL_MODE_REQUIRED; + mysql_options(&self->session, MYSQL_OPT_SSL_MODE, (char*)&tmp_uint); } #endif @@ -1123,7 +1123,8 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds) { #if MYSQL_VERSION_ID >= 50711 { - mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_VERIFY_IDENTITY); + tmp_uint= SSL_MODE_VERIFY_IDENTITY; + mysql_options(&self->session, MYSQL_OPT_SSL_MODE, (char*)&tmp_uint); } #else { @@ -1144,7 +1145,8 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds) #endif #if MYSQL_VERSION_ID >= 50711 { - mysql_options(&self->session, MYSQL_OPT_SSL_ENFORCE, SSL_MODE_DISABLED); + tmp_uint= SSL_MODE_DISABLED; + mysql_options(&self->session, MYSQL_OPT_SSL_MODE, (char*)&tmp_uint); } #endif }