From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 4 Jul 2022 05:51:06 +0000 (+0200)
Subject: Work on native compilation of SPNEGO client.
X-Git-Tag: v2.3.10~136
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=e25d219d5523f51f5acfcc79732b2da4638f0790;p=lgpl%2Fargeo-commons.git

Work on native compilation of SPNEGO client.
---

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
index 4b4d291a1..cf30d8a71 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
@@ -89,7 +89,9 @@ public class RemoteAuthUtils {
 			try {
 				// Get service's principal name
 				GSSManager manager = GSSManager.getInstance();
-				GSSName serverName = manager.createName(serverPrinc, GSSName.NT_HOSTBASED_SERVICE, KERBEROS_OID);
+				// GSSName serverName = manager.createName(serverPrinc,
+				// GSSName.NT_HOSTBASED_SERVICE, KERBEROS_OID);
+				GSSName serverName = manager.createName(serverPrinc, GSSName.NT_HOSTBASED_SERVICE);
 
 				// Get the context for authentication
 				context = manager.createContext(serverName, KERBEROS_OID, null, GSSContext.DEFAULT_LIFETIME);
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java b/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
index 806a57569..42b2a2d12 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
@@ -21,8 +21,8 @@ import org.argeo.cms.auth.RemoteAuthUtils;
 
 public class SpnegoHttpClient {
 	public static void main(String[] args) throws MalformedURLException {
-		String principal = System.getProperty("javax.security.auth.login.name");
-		if (args.length == 0 || principal == null) {
+//		String principal = System.getProperty("javax.security.auth.login.name");
+		if (args.length == 0 ) {
 			System.err.println("usage: java -Djavax.security.auth.login.name=<principal@REALM> "
 					+ SpnegoHttpClient.class.getName() + " <url>");
 			System.exit(1);
@@ -31,8 +31,8 @@ public class SpnegoHttpClient {
 		String url = args[0];
 		URL u = new URL(url);
 		String server = u.getHost();
-
-		URL jaasUrl = SpnegoAuthScheme.class.getResource("jaas.cfg");
+		
+		URL jaasUrl = SpnegoHttpClient.class.getResource("jaas.cfg");
 		System.setProperty("java.security.auth.login.config", jaasUrl.toExternalForm());
 		try {
 			LoginContext lc = new LoginContext("SINGLE_USER");