[jboss-cvs] JBossAS SVN: r102574 - projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP1_JBPAPP-3944/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego.

[jboss-cvs-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2010-03-18 14:07:20 -0400 (Thu, 18 Mar 2010)
New Revision: 102574

Modified:
   projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP1_JBPAPP-3944/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
Log:
[JBPAPP-3944] Relax detection of mech ordering.

Modified: projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP1_JBPAPP-3944/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP1_JBPAPP-3944/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java	2010-03-18 17:54:44 UTC (rev 102573)
+++ projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP1_JBPAPP-3944/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java	2010-03-18 18:07:20 UTC (rev 102574)
@@ -234,20 +234,21 @@
                      kerberosSupported = it.next().equals(kerberos);
                   }
 
-                  NegTokenTarg negTokenTarg = new NegTokenTarg();
-
                   if (kerberosSupported)
                   {
-                     negTokenTarg.setNegResult(NegTokenTarg.ACCEPT_INCOMPLETE);
-                     negTokenTarg.setSupportedMech(kerberos);
+                     log.warn("Kerberos MECH supported but not first in list.");
+                     gssToken = negTokenInit.getMechToken();
                   }
                   else
                   {
+                     NegTokenTarg negTokenTarg = new NegTokenTarg();
                      negTokenTarg.setNegResult(NegTokenTarg.REJECTED);
+
+                     negotiationContext.setResponseMessage(negTokenTarg);
+
+                     return Boolean.FALSE;
                   }
-                  negotiationContext.setResponseMessage(negTokenTarg);
 
-                  return Boolean.FALSE;
                }
 
             }