From fea3fd3b772db9138369208098ce7440f6d0d105 Mon Sep 17 00:00:00 2001 From: Richard Grime Date: Tue, 14 Jul 2020 18:03:01 +0000 Subject: [PATCH] GUACAMOLE-1136: Return correct MYSQL_SSL_CLIENT_ MySQL Environment incorrectly returned MYSQL_SSL_TRUST_ parameters for the file and password, instead of the expected MYSQL_SSL_CLIENT_ values. --- .../apache/guacamole/auth/mysql/conf/MySQLEnvironment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a27c2aa81..f45231937 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 @@ public class MySQLEnvironment extends JDBCEnvironment { * 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 @@ public class MySQLEnvironment extends JDBCEnvironment { * 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