diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-06-05 22:13:19 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-06-05 22:13:19 +0100 |
| commit | 72b6d01848e56a75349d663bc61bbe71f97a280b (patch) | |
| tree | 711ea1fca02e7f71f9ca2517249b6bb032b3f44a /sql-common | |
| parent | 5fb2c586f225361deae0f04dc6f72a3f0d168ac2 (diff) | |
| download | mariadb-git-72b6d01848e56a75349d663bc61bbe71f97a280b.tar.gz | |
MDEV-10246 ssl-* config file options have no effect without mysql_ssl_set()
Partially revert 4ef74979969ac9339d0d42c11a6f26632e6776f1
that caused regression.
Any ssl- option must imply use_ssl=1, even if mysql_set_ssl() was not
used.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 6321e64bc75..ec992f80e8d 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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 */ |