| commit | f94e7046ff6b4b8803ed5a15d731e7f23a5e604e | [log] [tgz] |
|---|---|---|
| author | Michael Jumper <mjumper@apache.org> | Thu Jun 25 17:55:48 2020 -0700 |
| committer | Michael Jumper <mjumper@apache.org> | Thu Jun 25 17:55:48 2020 -0700 |
| tree | c8372663ae9a43f89997d5191d41f87467959dba | |
| parent | f37e5e8214a81bf048fbd7085fb8fe860f30be06 [diff] | |
| parent | c71107e395e3a5e7b7d6deef08e90b2ab1db4491 [diff] |
Merge 1.2.0 changes back to master.
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 aca3f42..4e4f35e 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 @@ 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();