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

[abartlet at samba.org]

Author: abartlet
Date: 2006-06-14 23:45:23 +0000 (Wed, 14 Jun 2006)
New Revision: 557

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

Log:
Don't overwrite minor_status when cleaning up on failure.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/gssapi/accept_sec_context.c
   trunk/heimdal/lib/gssapi/decapsulate.c


Changeset:
Modified: trunk/heimdal/lib/gssapi/accept_sec_context.c
===================================================================
--- trunk/heimdal/lib/gssapi/accept_sec_context.c	2006-06-06 20:02:25 UTC (rev 556)
+++ trunk/heimdal/lib/gssapi/accept_sec_context.c	2006-06-14 23:45:23 UTC (rev 557)
@@ -698,6 +698,7 @@
            )
 {
     OM_uint32 ret = GSS_S_COMPLETE;
+    OM_uint32 minor_status2 = 0;
     krb5_data fwd_data;
     gss_ctx_id_t local_context;
 
@@ -772,7 +773,7 @@
 	if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) {
 	    *context_handle = local_context;
 	} else {
-	    gss_delete_sec_context(minor_status, 
+	    gss_delete_sec_context(&minor_status2, 
 				   &local_context, 
 				   NULL);
 	}

Modified: trunk/heimdal/lib/gssapi/decapsulate.c
===================================================================
--- trunk/heimdal/lib/gssapi/decapsulate.c	2006-06-06 20:02:25 UTC (rev 556)
+++ trunk/heimdal/lib/gssapi/decapsulate.c	2006-06-14 23:45:23 UTC (rev 557)
@@ -94,7 +94,7 @@
 OM_uint32
 gssapi_krb5_verify_header(u_char **str,
 			  size_t total_len,
-			  const u_char *type,
+			  const void *type,
 			  gss_OID oid)
 {
     OM_uint32 ret;
@@ -157,7 +157,7 @@
 gssapi_krb5_decapsulate(OM_uint32 *minor_status,    
 			gss_buffer_t input_token_buffer,
 			krb5_data *out_data,
-			const char *type,
+			const void *type,
 			gss_OID oid)
 {
     u_char *p;