From 543635807e1d3d516fe22fc37a82d85aeb22d65b Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 13 Apr 2004 20:04:13 +0000 Subject: [PATCH] * ccbase.c: the krb5_cc_resolve() function pointer ccresolver must be of type KRB5_CALLCONV ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16245 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/ccache/ChangeLog | 7 +++++++ src/lib/krb5/ccache/ccbase.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index ad73c2a54..afafc17a7 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,10 @@ +2004-04-13 Jeffrey Altman + + * ccbase.c: + krb5_cc_resolve() defines a function pointer ccresolver + which must be of type KRB5_CALLCONV + + 2004-04-06 Jeffrey Altman * cc_mslsa.c: diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index 9fff1ef0e..47ada5080 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -118,11 +118,12 @@ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache) } pfxlen = cp - name; + resid = name + pfxlen + 1; - + pfx = malloc (pfxlen+1); if (!pfx) - return ENOMEM; + return ENOMEM; memcpy (pfx, name, pfxlen); pfx[pfxlen] = '\0'; @@ -136,7 +137,7 @@ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache) } for (tlist = cc_typehead; tlist; tlist = tlist->next) { if (strcmp (tlist->ops->prefix, pfx) == 0) { - krb5_error_code (*ccresolver)() = tlist->ops->resolve; + krb5_error_code (KRB5_CALLCONV *ccresolver)() = tlist->ops->resolve; k5_mutex_unlock(&cc_typelist_lock); free(pfx); return (*ccresolver)(context, cache, resid); -- 2.26.2