From f06056b4e48b3794e6a7d5a54d0cf88ba6537d70 Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Tue, 16 Jun 2020 14:50:44 -0400
Subject: [PATCH] GUACAMOLE-728: Use correct sslMode options for passing to
 JDBC driver.

---
 .../auth/mysql/MySQLAuthenticationProviderModule.java  |  1 -
 .../apache/guacamole/auth/mysql/conf/MySQLSSLMode.java | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

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 5dead1545..aca3f422d 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
@@ -23,7 +23,6 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import java.io.File;
-import java.net.URI;
 import java.util.Properties;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.auth.mysql.conf.MySQLDriver;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLSSLMode.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLSSLMode.java
index 0820150c6..72dcd311e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLSSLMode.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLSSLMode.java
@@ -30,32 +30,32 @@ public enum MySQLSSLMode {
      * Do not use SSL at all.
      */
     @PropertyValue("disabled")
-    DISABLED("disabled"),
+    DISABLED("DISABLED"),
     
     /**
      * Prefer SSL, but fall back to unencrypted.
      */
     @PropertyValue("preferred")
-    PREFERRED("preferred"),
+    PREFERRED("PREFERRED"),
     
     /**
      * Require SSL, but perform no certificate validation.
      */
     @PropertyValue("required")
-    REQUIRED("required"),
+    REQUIRED("REQUIRED"),
     
     /**
      * Require SSL, and validate server certificate issuer.
      */
     @PropertyValue("verify-ca")
-    VERIFY_CA("verify-ca"),
+    VERIFY_CA("VERIFY_CA"),
     
     /**
      * Require SSL and validate both server certificate issuer and server
      * identity.
      */
     @PropertyValue("verify-identity")
-    VERIFY_IDENTITY("verify-identity");
+    VERIFY_IDENTITY("VERIFY_IDENTITY");
     
     /**
      * The value expected by and passed on to the JDBC driver for the given