diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-19 20:31:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-20 16:36:23 +0200 |
| commit | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (patch) | |
| tree | 5af36d5c35a14fc4983d766f5e080fd94939c4a2 /sql-common | |
| parent | 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 (diff) | |
| download | mariadb-git-c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506.tar.gz | |
respect client's desire to force ssl even when WITH_SSL=NO
of course, this combination can never succeed,
we must fail to connect here.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index b348afcff2d..e0412fca6bc 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1815,8 +1815,8 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , mysql->options.ssl_ca= set_ssl_option_unpack_path(ca); mysql->options.ssl_capath= set_ssl_option_unpack_path(capath); mysql->options.ssl_cipher= strdup_if_not_null(cipher); - mysql->options.use_ssl= TRUE; #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ + mysql->options.use_ssl= TRUE; DBUG_RETURN(0); } @@ -2563,7 +2563,6 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, int3store(buff+2, net->max_packet_size); end= buff+5; } -#ifdef HAVE_OPENSSL /* If client uses ssl and client also has to verify the server @@ -2581,6 +2580,7 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, goto error; } +#ifdef HAVE_OPENSSL if (mysql->client_flag & CLIENT_SSL) { /* Do the SSL layering. */ |