From 70c5dc6fa90e73cd13b2bfc6175079cd132ca1fb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 30 Oct 2023 16:07:34 -0400 Subject: [PATCH] Replace deprecated mysql_ssl_set with mysql_options() --- src/zm_db.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/zm_db.cpp b/src/zm_db.cpp index 708a2add9..94371a6fa 100644 --- a/src/zm_db.cpp +++ b/src/zm_db.cpp @@ -43,11 +43,9 @@ bool zmDbConnect() { } if ( !staticConfig.DB_SSL_CA_CERT.empty() ) { - mysql_ssl_set(&dbconn, - staticConfig.DB_SSL_CLIENT_KEY.c_str(), - staticConfig.DB_SSL_CLIENT_CERT.c_str(), - staticConfig.DB_SSL_CA_CERT.c_str(), - nullptr, nullptr); + mysql_options(&dbconn, MYSQL_OPT_SSL_KEY, staticConfig.DB_SSL_CLIENT_KEY.c_str()); + mysql_options(&dbconn, MYSQL_OPT_SSL_CERT, staticConfig.DB_SSL_CLIENT_CERT.c_str()); + mysql_options(&dbconn, MYSQL_OPT_SSL_CA, staticConfig.DB_SSL_CA_CERT.c_str()); } std::string::size_type colonIndex = staticConfig.DB_HOST.find(":");