diff options
| author | tonu@x153.internalnet <> | 2001-07-24 14:07:46 +0800 |
|---|---|---|
| committer | tonu@x153.internalnet <> | 2001-07-24 14:07:46 +0800 |
| commit | 85c287a43937ecbafc67dde08b438c60ed1f659f (patch) | |
| tree | ed5f3121d49f4cd731f353d0ff4b0684837cc5b5 /libmysql/libmysql.c | |
| parent | 248234f1d6931a32135bf8fffc7f4e0122f1f2b1 (diff) | |
| download | mariadb-git-85c287a43937ecbafc67dde08b438c60ed1f659f.tar.gz | |
OpenSSL fixes. Should not affect anything else.
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d6f5b7c523f..2d7ad15b772 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1380,7 +1380,7 @@ mysql_ssl_cipher(MYSQL *mysql) ** Free strings in the SSL structure and clear 'use_ssl' flag. ** NB! Errors are not reported until you do mysql_real_connect. ************************************************************************** - +*/ int STDCALL mysql_ssl_clear(MYSQL *mysql) { @@ -1392,11 +1392,11 @@ mysql_ssl_clear(MYSQL *mysql) mysql->options.ssl_cert = 0; mysql->options.ssl_ca = 0; mysql->options.ssl_capath = 0; - mysql->options.use_ssl = false; - mysql->connector_fd->delete(); + mysql->options.use_ssl = FALSE; + my_free(mysql->connector_fd,MYF(MY_ALLOW_ZERO_PTR)); mysql->connector_fd = 0; return 0; -}*/ +} #endif /* HAVE_OPENSSL */ /************************************************************************** @@ -1788,7 +1788,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); DBUG_PRINT("info", ("IO context %p",((struct st_VioSSLConnectorFd*)mysql->connector_fd)->ssl_context_)); - mysql->net.vio = sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); + sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); DBUG_PRINT("info", ("IO layer change done!")); } #endif /* HAVE_OPENSSL */ @@ -1972,8 +1972,7 @@ mysql_close(MYSQL *mysql) bzero((char*) &mysql->options,sizeof(mysql->options)); mysql->net.vio = 0; #ifdef HAVE_OPENSSL -/* ((VioConnectorFd*)(mysql->connector_fd))->delete(); - mysql->connector_fd = 0;*/ + mysql_ssl_clear(mysql); #endif /* HAVE_OPENSSL */ /* free/close slave list */ |