Commit 0b7dad09 authored by unknown's avatar unknown

Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient


sql-common/client.c:
  Store ssl_cipher setting read from my.cnf into "option->ssl_cipher"
parent 5c836d24
...@@ -1085,11 +1085,16 @@ void mysql_read_default_options(struct st_mysql_options *options, ...@@ -1085,11 +1085,16 @@ void mysql_read_default_options(struct st_mysql_options *options,
my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR)); my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME)); options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME));
break; break;
case 26: /* ssl_cipher */
my_free(options->ssl_cipher, MYF(MY_ALLOW_ZERO_PTR));
options->ssl_cipher= my_strdup(opt_arg, MYF(MY_WME));
break;
#else #else
case 13: /* Ignore SSL options */ case 13: /* Ignore SSL options */
case 14: case 14:
case 15: case 15:
case 16: case 16:
case 26:
break; break;
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
case 17: /* charset-lib */ case 17: /* charset-lib */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment