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

GUACAMOLE-1136: Merge return correct MYSQL_SSL_CLIENT_ properties

Browse Source
This commit is contained in:
Virtually Nick
2020-07-25 20:21:45 -04:00
committed by GitHub
parent 8e77864e63 fea3fd3b77
commit c247a1cfcd
1 changed files with 2 additions and 2 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/conf/MySQLEnvironment.java
View File

@@ -369,7 +369,7 @@ public class MySQLEnvironment extends JDBCEnvironment {
* If guacamole.properties cannot be parsed. * If guacamole.properties cannot be parsed.
*/ */
public File getMySQLSSLClientStore() throws GuacamoleException { public File getMySQLSSLClientStore() throws GuacamoleException {
return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_TRUST_STORE); return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_CLIENT_STORE);
} }
/** /**
@@ -384,7 +384,7 @@ public class MySQLEnvironment extends JDBCEnvironment {
* If guacamole.properties cannot be parsed. * If guacamole.properties cannot be parsed.
*/ */
public String getMYSQLSSLClientPassword() throws GuacamoleException { public String getMYSQLSSLClientPassword() throws GuacamoleException {
return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_TRUST_PASSWORD); return getProperty(MySQLGuacamoleProperties.MYSQL_SSL_CLIENT_PASSWORD);
} }
@Override @Override