svn commit: lorikeet r653 - in trunk/heimdal/lib/gssapi/krb5: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-11-07 03:19:22 +0000 (Tue, 07 Nov 2006)
New Revision: 653

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=653

Log:
DCE-STYLE mutual authentication isn't wrapped in an OID.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/gssapi/krb5/init_sec_context.c


Changeset:
Modified: trunk/heimdal/lib/gssapi/krb5/init_sec_context.c
===================================================================
--- trunk/heimdal/lib/gssapi/krb5/init_sec_context.c	2006-11-06 08:32:32 UTC (rev 652)
+++ trunk/heimdal/lib/gssapi/krb5/init_sec_context.c	2006-11-07 03:19:22 UTC (rev 653)
@@ -574,13 +574,22 @@
     if (actual_mech_type)
 	*actual_mech_type = GSS_KRB5_MECHANISM;
 
-    ret = _gsskrb5_decapsulate (minor_status, input_token, &indata,
-				   "\x02\x00", GSS_KRB5_MECHANISM);
-    if (ret) {
-	/* XXX - Handle AP_ERROR */
-	return ret;
+    if (req_flags & GSS_C_DCE_STYLE) {
+	/* There is no OID wrapping. */
+	indata.length	= input_token->length;
+	indata.data	= input_token->value;
+    } else {
+	ret = _gsskrb5_decapsulate (minor_status,
+				    input_token,
+				    &indata,
+				    "\x02\x00",
+				    GSS_KRB5_MECHANISM);
+	if (ret) {
+	    /* XXX - Handle AP_ERROR */
+	    return ret;
+	}
     }
-    
+
     kret = krb5_rd_rep (_gsskrb5_context,
 			ctx->auth_context,
 			&indata,