svn commit: r1100198 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java

[cschneider]

Author: cschneider
Date: Fri May  6 13:08:10 2011
New Revision: 1100198

URL: http://svn.apache.org/viewvc?rev=1100198&view=rev
Log:
CXF-3496 - Use OID SPNEGO instead of KERBEROS. Patch applied with thanks to 
Aris Tsaklidis (dunkelhaar)

Modified:
    
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java

Modified: 
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java?rev=1100198&r1=1100197&r2=1100198&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java
 (original)
+++ 
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java
 Fri May  6 13:08:10 2011
@@ -44,7 +44,7 @@ import org.ietf.jgss.Oid;
 
 public class SpnegoAuthSupplier implements HttpAuthSupplier {
     private static final String KERBEROS_OID = "1.2.840.113554.1.2.2";
-    //private static final String SPNEGO_OID = "1.3.6.1.5.5.2";
+    private static final String SPNEGO_OID = "1.3.6.1.5.5.2";
 
     private static final Logger LOG = 
LogUtils.getL7dLogger(SpnegoAuthSupplier.class);
 
@@ -122,8 +122,8 @@ public class SpnegoAuthSupplier implemen
         GSSManager manager = GSSManager.getInstance();
         GSSName serverName = manager.createName(spn, null);
 
-        // TODO Is it correct to use kerberos oid instead of spnego here?
-        Oid oid = new Oid(KERBEROS_OID);
+        // need to use SPNEGO_OID
+        Oid oid = new Oid(SPNEGO_OID);
         
         GSSContext context = manager
                 .createContext(serverName.canonicalize(oid), oid, null, 
GSSContext.DEFAULT_LIFETIME);