| commit | c247a1cfcdb7060f2b7b22c662b7928d2ce919c8 | [log] [tgz] |
|---|---|---|
| author | Virtually Nick <necouchman@users.noreply.github.com> | Sat Jul 25 20:21:45 2020 -0400 |
| committer | GitHub <noreply@github.com> | Sat Jul 25 20:21:45 2020 -0400 |
| tree | 12ac70eee1443c8aa669adb1e833a63cb71f438e | |
| parent | 8e77864e63867ca8a121278da9d49c3dbd037029 [diff] | |
| parent | fea3fd3b772db9138369208098ce7440f6d0d105 [diff] |
GUACAMOLE-1136: Merge return correct MYSQL_SSL_CLIENT_ properties
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLEnvironment.java index a27c2aa..f452319 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLEnvironment.java
@@ -369,7 +369,7 @@ * If guacamole.properties cannot be parsed. */ public File getMySQLSSLClientStore() throws GuacamoleException { - return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_TRUST_STORE); + return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_CLIENT_STORE); } /** @@ -384,7 +384,7 @@ * If guacamole.properties cannot be parsed. */ public String getMYSQLSSLClientPassword() throws GuacamoleException { - return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_TRUST_PASSWORD); + return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_CLIENT_PASSWORD); } @Override