diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-08-25 11:55:43 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-08-25 11:55:43 -0400 |
| commit | 5ea2a01feedc874fc01e9f1f0fe2a7e88a6f600b (patch) | |
| tree | 9380c0082be39f0a22e1cc94957f16d75b66c7f6 /sql-common | |
| parent | e4bfce30589e734607f7e81f58ffab659c682d9f (diff) | |
| parent | 89d759b93e3975e5d5e1c5cf9b901c01b9e80ff7 (diff) | |
| download | mariadb-git-5ea2a01feedc874fc01e9f1f0fe2a7e88a6f600b.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 6819caddf35..cfd53fb1012 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1514,7 +1514,6 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , mysql->options.ssl_ca= strdup_if_not_null(ca); mysql->options.ssl_capath= strdup_if_not_null(capath); mysql->options.ssl_cipher= strdup_if_not_null(cipher); - mysql->options.ssl_verify_server_cert= FALSE; /* Off by default */ #endif /* HAVE_OPENSSL */ DBUG_RETURN(0); } @@ -2203,7 +2202,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, DBUG_PRINT("info", ("IO layer change done!")); /* Verify server cert */ - if (mysql->options.ssl_verify_server_cert && + if ((client_flag & CLIENT_SSL_VERIFY_SERVER_CERT) && ssl_verify_server_cert(mysql->net.vio, mysql->host)) { set_mysql_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate); @@ -2950,7 +2949,10 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) mysql->reconnect= *(my_bool *) arg; break; case MYSQL_OPT_SSL_VERIFY_SERVER_CERT: - mysql->options.ssl_verify_server_cert= *(my_bool *) arg; + if (!arg || test(*(uint*) arg)) + mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT; + else + mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT; break; default: DBUG_RETURN(1); |