diff options
| author | Justin Anderson <jander@mit.edu> | 2008-09-23 19:40:52 +0000 |
|---|---|---|
| committer | Justin Anderson <jander@mit.edu> | 2008-09-23 19:40:52 +0000 |
| commit | b756a048a181f266a22d1bcf043e10369d39cd78 (patch) | |
| tree | d893e3bcb275da6f904db41b936b364f0d6c5cf9 /src/kim/lib | |
| parent | 5e158de9231f955c9bb017981ded6ce6019e7abe (diff) | |
| download | krb5-b756a048a181f266a22d1bcf043e10369d39cd78.tar.gz krb5-b756a048a181f266a22d1bcf043e10369d39cd78.tar.xz krb5-b756a048a181f266a22d1bcf043e10369d39cd78.zip | |
kim_ccache_get_display_name was calling kim_ccache_create_resolve_name with its parameters in the wrong order
kim_ccache_iterator_next wasn't handling the end of iteration correctly.
ticket:6055
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20746 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kim/lib')
| -rw-r--r-- | src/kim/lib/kim_ccache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kim/lib/kim_ccache.c b/src/kim/lib/kim_ccache.c index 5831a66ad..dd6bdf77d 100644 --- a/src/kim/lib/kim_ccache.c +++ b/src/kim/lib/kim_ccache.c @@ -87,14 +87,14 @@ kim_error kim_ccache_iterator_next (kim_ccache_iterator in_ccache_iterator, in_ccache_iterator->cursor, &ccache); - if (!terr) { + if (ccache) { err = kim_ccache_create_from_krb5_ccache (out_ccache, in_ccache_iterator->context, ccache); - } else if (terr == KRB5_CC_END) { - *out_ccache = NULL; /* no more ccaches */ - } else { + *out_ccache = NULL; /* no more ccaches */ + } + if (terr && terr != KRB5_CC_END) { err = krb5_error (in_ccache_iterator->context, terr); } } @@ -598,7 +598,7 @@ kim_error kim_ccache_get_display_name (kim_ccache in_ccache, kim_string name = krb5_cc_get_name (in_ccache->context, in_ccache->ccache); - err = kim_ccache_create_resolve_name (out_display_name, type, name); + err = kim_ccache_create_resolve_name (out_display_name, name, type); } return check_error (err); |