diff options
| author | Tom Yu <tlyu@mit.edu> | 2010-11-23 23:51:50 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2010-11-23 23:51:50 +0000 |
| commit | e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e (patch) | |
| tree | f7113a04741192c6eba6155067eaaadc45923496 | |
| parent | 3af1aaae7a1b9da72c80a5478cfd384d41ef59a6 (diff) | |
| download | krb5-e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e.tar.gz krb5-e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e.tar.xz krb5-e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e.zip | |
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
| -rw-r--r-- | src/include/k5-int.h | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/gic_pwd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 446c1fa740..a0d7c17285 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 1e0b741e38..1fdc814d22 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. */ |