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

[abartlet at samba.org]

Author: abartlet
Date: 2005-11-02 09:54:13 +0000 (Wed, 02 Nov 2005)
New Revision: 492

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

Log:
Merge Samba3 compatability hack from Samba4.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/gssapi/8003.c


Changeset:
Modified: trunk/heimdal/lib/gssapi/8003.c
===================================================================
--- trunk/heimdal/lib/gssapi/8003.c	2005-11-02 04:30:38 UTC (rev 491)
+++ trunk/heimdal/lib/gssapi/8003.c	2005-11-02 09:54:13 UTC (rev 492)
@@ -182,9 +182,18 @@
 	*minor_status = 0;
 	return GSS_S_BAD_BINDINGS;
     }
-
+    
+    /* This is the case where Samba3 has built GSSAPI out of
+     * krb5 the 'dodgy' way.  We have to accept the non-GSSAPI
+     * checksum because windows does */
+    
+    if(cksum->cksumtype != CKSUMTYPE_GSSAPI) {
+	    *flags = 0;
+	    return GSS_S_COMPLETE;
+    }
+    
     /* XXX should handle checksums > 24 bytes */
-    if(cksum->cksumtype != CKSUMTYPE_GSSAPI || cksum->checksum.length < 24) {
+    if(cksum->checksum.length < 24) {
 	*minor_status = 0;
 	return GSS_S_BAD_BINDINGS;
     }