diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-23 12:43:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-07-28 17:18:39 +0200 |
| commit | ce9385b73cd8f12186ee683ad7f1fc284de11ffe (patch) | |
| tree | 13fb669b4a86e7f1673d04a4b0a690513eebd7f5 /client/mysqltest.cc | |
| parent | 4ce6e78059c1a91765c91afa5330737bd7568d0a (diff) | |
| download | mariadb-git-ce9385b73cd8f12186ee683ad7f1fc284de11ffe.tar.gz | |
MDEV-27105 --ssl option set as default for mariadb CLI
but without server cert verification
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 7d807e00c1d..03cf635fd3d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6118,12 +6118,8 @@ void do_connect(struct st_command *command) mysql_options(con_slot->mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl); mysql_options(con_slot->mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath); mysql_options(con_slot->mysql, MARIADB_OPT_TLS_VERSION, opt_tls_version); -#if MYSQL_VERSION_ID >= 50000 - /* Turn on ssl_verify_server_cert only if host is "localhost" */ - opt_ssl_verify_server_cert= !strcmp(ds_host.str, "localhost"); mysql_options(con_slot->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &opt_ssl_verify_server_cert); -#endif } #endif @@ -9849,12 +9845,8 @@ int main(int argc, char **argv) opt_ssl_capath, opt_ssl_cipher); mysql_options(con->mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl); mysql_options(con->mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath); -#if MYSQL_VERSION_ID >= 50000 - /* Turn on ssl_verify_server_cert only if host is "localhost" */ - opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost"); mysql_options(con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &opt_ssl_verify_server_cert); -#endif } #endif |