mariadb-java-client/remove_waffle-jna.patch

46 lines
1.6 KiB
Diff
Raw Normal View History

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