From 6fc09f4ee8f3319073938edb311a79f89f574d0f Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Thu, 25 Jun 2020 20:13:18 -0400 Subject: [PATCH] GUACAMOLE-728: Only set MySQL JDBC useSSL when sslmode is disabled. --- .../auth/mysql/MySQLAuthenticationProviderModule.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java index aca3f422d..4e4f35ef8 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java @@ -87,11 +87,9 @@ public class MySQLAuthenticationProviderModule implements Module { MySQLSSLMode sslMode = environment.getMySQLSSLMode(); driverProperties.setProperty("sslMode", sslMode.getDriverValue()); - // Set legacy properties + // For compatibility, set legacy useSSL property when SSL is disabled. if (sslMode == MySQLSSLMode.DISABLED) driverProperties.setProperty("useSSL", "false"); - else - driverProperties.setProperty("useSSL", "true"); // Check other SSL settings and set as required File trustStore = environment.getMySQLSSLTrustStore();