8225f4a5bdc277983e65d138da3aa639c7502253
galt
  Wed Nov 27 21:21:44 2024 -0800
oops one of the define tests was accidentally missing.

diff --git src/hg/lib/jksql.c src/hg/lib/jksql.c
index 7b8c939..1adfa8a 100644
--- src/hg/lib/jksql.c
+++ src/hg/lib/jksql.c
@@ -1128,31 +1128,31 @@
 // If turned on this can defeat Man-In-The-Middle attacks.
 
 if (sp->verifyServerCert && !sameString(sp->verifyServerCert,"0")) // TURN VERIFICATION ON
     {
     #if !defined(MARIADB_BASE_VERSION) && defined(MYSQL_VERSION_ID) && (MYSQL_VERSION_ID >= 80000)
     int ssl_mode = SSL_MODE_REQUIRED;
     mysql_options(conn, MYSQL_OPT_SSL_MODE, &ssl_mode);
     #else
     my_bool flag = TRUE;
     mysql_options(conn, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &flag);
     #endif
 
     }
 else   // TURN VERIFICATION OFF
     {
-    #if !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80000 // OVER-RIDE DEFAULT COMPILED IN.
+    #if !defined(MARIADB_BASE_VERSION) && defined(MYSQL_VERSION_ID) && (MYSQL_VERSION_ID >= 80000) // OVER-RIDE DEFAULT COMPILED IN.
     mysql_options(conn, MYSQL_OPT_SSL_MODE, SSL_MODE_PREFERRED);
     #else
     my_bool flag = FALSE;
     mysql_options(conn, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &flag);
     #endif
     }
 
 #if (MYSQL_VERSION_ID >= 50603) // mysql version "5.6.3"
     // If certificate revocation list file provided, set mysql option
     if (sp->crl)
 	mysql_options(conn, MYSQL_OPT_SSL_CRL, &sp->crl);
 
     // If path to directory with crl files provided, set mysql option
     if (sp->crlPath)
 	mysql_options(conn, MYSQL_OPT_SSL_CRLPATH, &sp->crlPath);