oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

remove krb5_cc_next_cred_match, make work

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25022 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-04-03 04:00:05 +00:00
parent 48cb3aa538
commit 6f3721ba18
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/krb5/cache.c
View File

@@ -776,32 +776,6 @@ krb5_cc_next_cred (krb5_context context,
return (*id->ops->get_next)(context, id, cursor, creds); return (*id->ops->get_next)(context, id, cursor, creds);
} }
/**
* Like krb5_cc_next_cred, but allow for selective retrieval
*
* @ingroup krb5_ccache
*/
krb5_error_code KRB5_LIB_FUNCTION
krb5_cc_next_cred_match(krb5_context context,
const krb5_ccache id,
krb5_cc_cursor * cursor,
krb5_creds * creds,
krb5_flags whichfields,
const krb5_creds * mcreds)
{
krb5_error_code ret;
while (1) {
ret = krb5_cc_next_cred(context, id, cursor, creds);
if (ret)
return ret;
if (mcreds == NULL || krb5_compare_creds(context, whichfields, mcreds, creds))
return 0;
krb5_free_cred_contents(context, creds);
}
}
/** /**
* Destroy the cursor `cursor'. * Destroy the cursor `cursor'.
* *
@@ -907,9 +881,7 @@ krb5_cc_copy_match_f(krb5_context context,
return ret; return ret;
} }
while ((ret = krb5_cc_next_cred(context, from, cursor, &cred)) == 0) { while ((ret = krb5_cc_next_cred(context, from, &cursor, &cred)) == 0) {
if (ret)
break;
if (match == NULL || (*match)(context, matchctx, &cred) == 0) { if (match == NULL || (*match)(context, matchctx, &cred) == 0) {
if (matched) if (matched)
(*matched)++; (*matched)++;
@@ -921,6 +893,8 @@ krb5_cc_copy_match_f(krb5_context context,
} }
krb5_cc_end_seq_get(context, from, &cursor); krb5_cc_end_seq_get(context, from, &cursor);
krb5_free_principal(context, princ); krb5_free_principal(context, princ);
if (ret == KRB5_CC_END)
ret = 0;
return ret; return ret;
} }