mariadb-java-client/remove_waffle-jna.patch

43 lines
1.5 KiB
Diff
Raw Normal View History

2021-07-23 08:16:57 +00:00
Date: Thu, 6 May 2021 08:28:06 +0200
Subject: [PATCH] remove waffle-jna
---
2021-07-23 08:16:57 +00:00
.../authentication/addon/gssapi/GssUtility.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
2021-07-23 08:16:57 +00:00
diff --git a/src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/GssUtility.java b/src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/GssUtility.java
index 5f050df..1801701 100644
--- a/src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/GssUtility.java
+++ b/src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/GssUtility.java
@@ -9,26 +9,11 @@ import com.sun.jna.Platform;
2019-01-29 10:45:15 +00:00
public class GssUtility {
/**
- * Get authentication method according to classpath. Windows native authentication is using
- * Waffle-jna.
2021-07-23 08:16:57 +00:00
+ * Get authentication method according to classpath
2019-01-29 10:45:15 +00:00
*
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
}
}
--
2021-07-23 08:16:57 +00:00
2.30.2