1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-10246 ssl-* config file options have no effect without mysql_ssl_set()

Browse Source 
Partially revert 4ef74979969ac9339d0d42c11a6f26632e6776f1
that caused regression.

Any ssl- option must imply use_ssl=1, even if mysql_set_ssl() was not
used.
This commit is contained in:
Vladislav Vaintroub 2018-06-05 22:13:19 +01:00
parent 5fb2c586f2
commit 72b6d01848
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql-common/client.c
View File

@ -2541,6 +2541,10 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
mysql->client_flag|= CLIENT_MULTI_RESULTS;
#ifdef HAVE_OPENSSL
if (mysql->options.ssl_key || mysql->options.ssl_cert ||
mysql->options.ssl_ca || mysql->options.ssl_capath ||
mysql->options.ssl_cipher)
mysql->options.use_ssl = 1;
if (mysql->options.use_ssl)
mysql->client_flag|= CLIENT_SSL;
#endif /* HAVE_OPENSSL */