mysql: fix ssl enforcing for mysql < 8.0

razvancrainea · razvancrainea · commit 1ea6e9e21615 · 2024-11-20T11:49:08.000+02:00
diff --git a/modules/db_mysql/my_con.c b/modules/db_mysql/my_con.c
@@ -144,7 +144,7 @@ int db_mysql_connect(struct my_con* ptr)
 			(tls_opts & MY_CON_TLS_CA_DIR) ? ptr->tls_dom->ca_directory:NULL,
 			(tls_opts & MY_CON_TLS_CIPHERS) ? ptr->tls_dom->ciphers_list:NULL);
 	}
-#ifdef LIBMARIADB
+#if (defined LIBMARIADB) || (MYSQL_VERSION_ID < 80000)
 	mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&use_tls);
 #else
 	tls_opts = (use_tls?SSL_MODE_PREFERRED:SSL_MODE_DISABLED);

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ int db_mysql_connect(struct my_con* ptr)`
`144`	`144`	`(tls_opts & MY_CON_TLS_CA_DIR) ? ptr->tls_dom->ca_directory:NULL,`
`145`	`145`	`(tls_opts & MY_CON_TLS_CIPHERS) ? ptr->tls_dom->ciphers_list:NULL);`
`146`	`146`	`}`
`147`		`-#ifdef LIBMARIADB`
	`147`	`+#if (defined LIBMARIADB) \|\| (MYSQL_VERSION_ID < 80000)`
`148`	`148`	`mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&use_tls);`
`149`	`149`	`#else`
`150`	`150`	`tls_opts = (use_tls?SSL_MODE_PREFERRED:SSL_MODE_DISABLED);`