svn rev #24532: trunk/src/ include/ lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24532
Commit By: tlyu
Log Message:
ticket: 6825

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.


Changed Files:
U   trunk/src/include/k5-int.h
U   trunk/src/lib/krb5/krb/gic_pwd.c
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h	2010-11-23 23:51:45 UTC (rev 24531)
+++ trunk/src/include/k5-int.h	2010-11-23 23:51:50 UTC (rev 24532)
@@ -1150,7 +1150,7 @@
     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;
 

Modified: trunk/src/lib/krb5/krb/gic_pwd.c
===================================================================
--- trunk/src/lib/krb5/krb/gic_pwd.c	2010-11-23 23:51:45 UTC (rev 24531)
+++ trunk/src/lib/krb5/krb/gic_pwd.c	2010-11-23 23:51:50 UTC (rev 24532)
@@ -159,7 +159,7 @@
 
     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. */