diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2004-04-13 20:04:13 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2004-04-13 20:04:13 +0000 |
| commit | 543635807e1d3d516fe22fc37a82d85aeb22d65b (patch) | |
| tree | 990710c7c56c058736faf73d7c6333b9172a3623 | |
| parent | 76997aa74e58eac44402f44ee18448e248fb5c01 (diff) | |
| download | krb5-543635807e1d3d516fe22fc37a82d85aeb22d65b.tar.gz krb5-543635807e1d3d516fe22fc37a82d85aeb22d65b.tar.xz krb5-543635807e1d3d516fe22fc37a82d85aeb22d65b.zip | |
* 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
| -rw-r--r-- | src/lib/krb5/ccache/ChangeLog | 7 | ||||
| -rw-r--r-- | 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 <jaltman@mit.edu> + + * ccbase.c: + krb5_cc_resolve() defines a function pointer ccresolver + which must be of type KRB5_CALLCONV + + 2004-04-06 Jeffrey Altman <jaltman@mit.edu> * 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); |