From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 13 Apr 2004 20:00:19 +0000 (+0000)
Subject:     * k5unseal.c: gss_krb5int_unseal_token_v3() takes a pointer to
X-Git-Tag: krb5-1.4-beta1~494
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76997aa74e58eac44402f44ee18448e248fb5c01;p=krb5.git

* k5unseal.c: gss_krb5int_unseal_token_v3() takes a pointer to
      krb5_context
    * import_sec_context.c: krb5_gss_ser_init() contains a function
      pointer table.  this table must use pointers to functions of
      type KRB5_CALLCONV.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16244 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 40c7c6c09..caceb6e40 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-13  Jeffrey Altman <jaltman@mit.edu>
+ 
+    * k5unseal.c: gss_krb5int_unseal_token_v3() takes a pointer to 
+      krb5_context
+    * import_sec_context.c: krb5_gss_ser_init() contains a function
+      pointer table.  this table must use pointers to functions of
+      type KRB5_CALLCONV.
+
 2004-03-20  Ken Raeburn  <raeburn@mit.edu>
 
 	* rel_cred.c (krb5_gss_release_cred): Create and destroy a local
diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c
index 19ddb09d3..84072f549 100644
--- a/src/lib/gssapi/krb5/import_sec_context.c
+++ b/src/lib/gssapi/krb5/import_sec_context.c
@@ -56,7 +56,7 @@ krb5_error_code
 krb5_gss_ser_init (krb5_context context)
 {
     krb5_error_code code;
-    static krb5_error_code (*const fns[])(krb5_context) = {
+    static krb5_error_code (KRB5_CALLCONV *const fns[])(krb5_context) = {
 	krb5_ser_context_init, krb5_ser_auth_context_init,
 	krb5_ser_ccache_init, krb5_ser_rcache_init, krb5_ser_keytab_init,
     };
diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index 714610102..5bb44fd52 100644
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -541,7 +541,7 @@ kg_unseal(minor_status, context_handle, input_token_buffer,
 			    message_buffer, conf_state, qop_state,
 			    toktype);
     else
-	return gss_krb5int_unseal_token_v3(ctx->k5_context, minor_status, ctx,
+	return gss_krb5int_unseal_token_v3(&ctx->k5_context, minor_status, ctx,
 					   ptr, bodysize, message_buffer,
 					   conf_state, qop_state, toktype);
 }