From bfff6b0e640b3b3456ec1d9d26da0bd80a08585f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 8 May 2006 23:30:40 +0000
Subject: r15515: Syncronsise with current lorikeet-heimdal.

Andrew Bartlett
(This used to be commit 0132312124260f74001546a34ff96db89d72b7f6)
---
 source4/heimdal/lib/gssapi/8003.c    | 9 ++-------
 source4/heimdal/lib/gssapi/get_mic.c | 4 +++-
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'source4/heimdal/lib/gssapi')

diff --git a/source4/heimdal/lib/gssapi/8003.c b/source4/heimdal/lib/gssapi/8003.c
index 73ecc90ea8..359bb6e715 100644
--- a/source4/heimdal/lib/gssapi/8003.c
+++ b/source4/heimdal/lib/gssapi/8003.c
@@ -184,14 +184,9 @@ gssapi_krb5_verify_8003_checksum(
 	*minor_status = 0;
 	return GSS_S_BAD_BINDINGS;
     }
-    
-    if(cksum->cksumtype != CKSUMTYPE_GSSAPI) {
-	*minor_status = 0;
-	return GSS_S_BAD_BINDINGS;
-    }
-    
+
     /* XXX should handle checksums > 24 bytes */
-    if(cksum->checksum.length < 24) {
+    if(cksum->cksumtype != CKSUMTYPE_GSSAPI || cksum->checksum.length < 24) {
 	*minor_status = 0;
 	return GSS_S_BAD_BINDINGS;
     }
diff --git a/source4/heimdal/lib/gssapi/get_mic.c b/source4/heimdal/lib/gssapi/get_mic.c
index fc9e9aa1a9..76f69cf41c 100644
--- a/source4/heimdal/lib/gssapi/get_mic.c
+++ b/source4/heimdal/lib/gssapi/get_mic.c
@@ -33,7 +33,7 @@
 
 #include "gssapi_locl.h"
 
-RCSID("$Id: get_mic.c,v 1.30 2006/04/02 02:12:52 lha Exp $");
+RCSID("$Id: get_mic.c,v 1.31 2006/05/08 09:55:37 lha Exp $");
 
 static OM_uint32
 mic_des
@@ -172,6 +172,8 @@ mic_des3
   tmp = malloc (message_buffer->length + 8);
   if (tmp == NULL) {
       free (message_token->value);
+      message_token->value = NULL;
+      message_token->length = 0;
       *minor_status = ENOMEM;
       return GSS_S_FAILURE;
   }
-- 
cgit