From: Tom Yu <tlyu@mit.edu>
Date: Tue, 23 Nov 2010 23:51:50 +0000 (+0000)
Subject: Update krb5_gic_opt_private and related code to reflect the change of
X-Git-Tag: krb5-1.10-alpha1~647
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e;p=krb5.git

Update krb5_gic_opt_private and related code to reflect the change of
krb5_expire_callback_func from a function typedef to a function
pointer typedef.  This was causing segfaults.

ticket: 6825

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 446c1fa74..a0d7c1728 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1150,7 +1150,7 @@ typedef struct _krb5_gic_opt_private {
     char * fast_ccache_name;
     krb5_ccache out_ccache;
     krb5_flags fast_flags;
-    krb5_expire_callback_func *expire_cb;
+    krb5_expire_callback_func expire_cb;
     void *expire_data;
 } krb5_gic_opt_private;
 
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index 1e0b741e3..1fdc814d2 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -159,7 +159,7 @@ warn_pw_expiry(krb5_context context, krb5_get_init_creds_opt *options,
 
     ret = krb5int_gic_opt_to_opte(context, options, &opte, 0, "");
     if (ret == 0 && opte->opt_private->expire_cb != NULL) {
-        krb5_expire_callback_func *cb = opte->opt_private->expire_cb;
+        krb5_expire_callback_func cb = opte->opt_private->expire_cb;
         void *cb_data = opte->opt_private->expire_data;
 
         /* Invoke the expire callback and don't send prompter warnings. */