--- lbbs/src/database.c 2025/11/21 02:49:26 1.25 +++ lbbs/src/database.c 2025/11/27 11:24:46 1.27 @@ -13,9 +13,12 @@ #include "common.h" #include "database.h" #include "log.h" +#include +#include #include #include #include +#include // Global declaration for database char DB_ca_cert[FILE_PATH_LEN] = "conf/ca_cert.pem"; @@ -29,11 +32,13 @@ MYSQL *db_open() { MYSQL *db = NULL; #ifdef HAVE_MARIADB_CLIENT - my_bool disabled = 0; + my_bool verify_server_cert = 0; #else - unsigned int ssl_mode = SSL_MODE_VERIFY_CA; + unsigned int ssl_mode = SSL_MODE_PREFERRED; #endif char sql[SQL_BUFFER_LEN]; + int fd; + int have_ca_cert = 0; db = mysql_init(NULL); if (db == NULL) @@ -42,14 +47,31 @@ MYSQL *db_open() return NULL; } - if (mysql_ssl_set(db, NULL, NULL, DB_ca_cert, NULL, NULL) != 0) + fd = open(DB_ca_cert, O_RDONLY); + if (fd == -1) + { + if (errno != ENOENT) + { + log_error("open(%s) error: %d\n", DB_ca_cert, errno); + } + } + else + { + close(fd); + have_ca_cert = 1; +#ifndef HAVE_MARIADB_CLIENT + ssl_mode = SSL_MODE_VERIFY_CA; +#endif + } + + if (mysql_ssl_set(db, NULL, NULL, (have_ca_cert ? DB_ca_cert : NULL), NULL, NULL) != 0) { log_error("mysql_ssl_set() error\n"); return NULL; } #ifdef HAVE_MARIADB_CLIENT - if (mysql_optionsv(db, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &disabled) != 0) + if (mysql_optionsv(db, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &verify_server_cert) != 0) { log_error("mysql_optionsv() error\n"); return NULL;