|
 |
f44e7d |
From c1e587054376db950495c02672675c801f454a6b Mon Sep 17 00:00:00 2001
|
|
|
f44e7d |
From: Ondrej Dubaj <odubaj@redhat.com>
|
|
|
f44e7d |
Date: Mon, 10 Feb 2020 18:08:39 +0100
|
|
|
f44e7d |
Subject: [PATCH] remove waffle-jna
|
|
|
6b9fe1 |
|
|
|
6b9fe1 |
---
|
|
|
f44e7d |
.../send/authentication/gssapi/GssUtility.java | 18 ++----------------
|
|
|
f44e7d |
1 file changed, 2 insertions(+), 16 deletions(-)
|
|
|
6b9fe1 |
|
|
|
f44e7d |
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java b/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java
|
|
|
f44e7d |
index 810500e..127b580 100644
|
|
|
f44e7d |
--- a/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java
|
|
|
f44e7d |
+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java
|
|
|
f44e7d |
@@ -5,26 +5,12 @@ import com.sun.jna.*;
|
|
|
f44e7d |
public class GssUtility {
|
|
|
6b9fe1 |
|
|
|
f44e7d |
/**
|
|
|
f44e7d |
- * Get authentication method according to classpath. Windows native authentication is using
|
|
|
f44e7d |
- * Waffle-jna.
|
|
|
f44e7d |
+ * Get authentication method according to classpath.
|
|
|
f44e7d |
+ *
|
|
|
f44e7d |
*
|
|
|
f44e7d |
* @return authentication method
|
|
|
f44e7d |
*/
|
|
|
f44e7d |
public static GssapiAuth getAuthenticationMethod() {
|
|
|
f44e7d |
- try {
|
|
|
f44e7d |
- // Waffle-jna has jna as dependency, so if not available on classpath, just use standard
|
|
|
f44e7d |
- // authentication
|
|
|
f44e7d |
- if (Platform.isWindows()) {
|
|
|
6b9fe1 |
- try {
|
|
|
f44e7d |
- Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
|
|
|
f44e7d |
- return new WindowsNativeSspiAuthentication();
|
|
|
f44e7d |
- } catch (ClassNotFoundException cle) {
|
|
|
f44e7d |
- // waffle not in the classpath
|
|
|
6b9fe1 |
- }
|
|
|
f44e7d |
- }
|
|
|
f44e7d |
- } catch (Throwable cle) {
|
|
|
f44e7d |
- // jna jar's are not in classpath
|
|
|
6b9fe1 |
- }
|
|
|
f44e7d |
return new StandardGssapiAuthentication();
|
|
|
f44e7d |
}
|
|
|
6b9fe1 |
}
|
|
|
6b9fe1 |
--
|
|
|
f44e7d |
2.19.1
|
|
|
6b9fe1 |
|