Author: wyoung
Date: Fri Jun 27 06:28:27 2008
New Revision: 2298
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2298&view=rev
Log:
Passing 0 to mysql_ssl_set() for SSL parameters not given when
populating SslOption object instead of an empty string. Fixes bug
#11796. Fix by Petteri Kiiskinen <[EMAIL PROTECTED]>
Modified:
trunk/lib/options.cpp
Modified: trunk/lib/options.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/options.cpp?rev=2298&r1=2297&r2=2298&view=diff
==============================================================================
--- trunk/lib/options.cpp (original)
+++ trunk/lib/options.cpp Fri Jun 27 06:28:27 2008
@@ -308,8 +308,12 @@
{
#if defined(HAVE_MYSQL_SSL_SET)
return dbd->connected() ? Option::err_connected :
- dbd->enable_ssl(key_.c_str(), cert_.c_str(),
ca_.c_str(),
- capath_.c_str(), cipher_.c_str()) ?
+ dbd->enable_ssl(
+ key_.size() ? key_.c_str() : 0,
+ cert_.size() ? cert_.c_str() : 0,
+ ca_.size() ? ca_.c_str() : 0,
+ capath_.size() ? capath_.c_str() : 0,
+ cipher_.size() ? cipher_.c_str() : 0) ?
Option::err_NONE : Option::err_api_reject;
#else
return Option::err_api_limit;
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
