diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-27 19:26:01 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-27 19:26:01 +0200 |
| commit | f7acb850c29dc06219da2a51d2da0a55d389df60 (patch) | |
| tree | f45054ea92c121c58ca97cd9fd6f3df4a3cf2f5f /sql-common | |
| parent | 9b2e0127f02209a6e93fb3dcf2755b7abaf1d097 (diff) | |
| download | mariadb-git-f7acb850c29dc06219da2a51d2da0a55d389df60.tar.gz | |
Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERT
- Interpret the pointer passed to 'mysql_options' for
MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool
- In 5.1 the mysql_options signature will be chanegd to take
a 'void*' in order to further emphasize the need for a pointer
to correct type
client/mysqltest.c:
Turn on ssl_verify_server_cert for all connections to "localhost"
in mysqltest
sql-common/client.c:
The pointer passed to 'mysql_options' for MYSQL_OPT_SSL_VERIFY_SERVER_CERT
should be interpreted as a my_bool pointer (aka char*).
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 1acaaea9a79..3342db4bcfe 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3022,7 +3022,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) mysql->reconnect= *(my_bool *) arg; break; case MYSQL_OPT_SSL_VERIFY_SERVER_CERT: - if (!arg || test(*(uint*) arg)) + if (*(my_bool*) arg) mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT; else mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT; |