safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.2.0 changes back to master.

Browse Source
This commit is contained in:
Michael Jumper
2020-06-25 17:55:48 -07:00
parent f37e5e8214 c71107e395
commit f94e7046ff
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
View File

@@ -87,11 +87,9 @@ public class MySQLAuthenticationProviderModule implements Module {
MySQLSSLMode sslMode = environment.getMySQLSSLMode(); MySQLSSLMode sslMode = environment.getMySQLSSLMode();
driverProperties.setProperty("sslMode", sslMode.getDriverValue()); driverProperties.setProperty("sslMode", sslMode.getDriverValue());
// Set legacy properties // For compatibility, set legacy useSSL property when SSL is disabled.
if (sslMode == MySQLSSLMode.DISABLED) if (sslMode == MySQLSSLMode.DISABLED)
driverProperties.setProperty("useSSL", "false"); driverProperties.setProperty("useSSL", "false");
else
driverProperties.setProperty("useSSL", "true");
// Check other SSL settings and set as required // Check other SSL settings and set as required
File trustStore = environment.getMySQLSSLTrustStore(); File trustStore = environment.getMySQLSSLTrustStore();