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

use krb5_cc_new_unique, use constants for cache types

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25060 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-04-03 04:07:38 +00:00
parent 5697c8e76c
commit 38b93186dd
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/krb5/test_cc.c
View File

@@ -151,7 +151,7 @@ test_mcache(krb5_context context)
*/ */
static void static void
test_init_vs_destroy(krb5_context context, const krb5_cc_ops *ops) test_init_vs_destroy(krb5_context context, const char *type)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_ccache id, id2; krb5_ccache id, id2;
@@ -162,9 +162,9 @@ test_init_vs_destroy(krb5_context context, const krb5_cc_ops *ops)
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_parse_name"); krb5_err(context, 1, ret, "krb5_parse_name");
ret = krb5_cc_gen_new(context, ops, &id); ret = krb5_cc_new_unique(context, type, &id);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_cc_gen_new"); krb5_err(context, 1, ret, "krb5_cc_new_unique");
asprintf(&n, "%s:%s", asprintf(&n, "%s:%s",
krb5_cc_get_type(context, id), krb5_cc_get_type(context, id),
@@ -191,7 +191,7 @@ test_init_vs_destroy(krb5_context context, const krb5_cc_ops *ops)
} }
static void static void
test_cache_remove(krb5_context context, const krb5_cc_ops *ops) test_cache_remove(krb5_context context, const char *type)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_ccache id; krb5_ccache id;
@@ -202,7 +202,7 @@ test_cache_remove(krb5_context context, const krb5_cc_ops *ops)
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_parse_name"); krb5_err(context, 1, ret, "krb5_parse_name");
ret = krb5_cc_gen_new(context, ops, &id); ret = krb5_cc_new_unique(context, type, &id);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_cc_gen_new"); krb5_err(context, 1, ret, "krb5_cc_gen_new");
@@ -474,11 +474,11 @@ test_move(krb5_context context, const char *type)
if (ops == NULL) if (ops == NULL)
return; return;
ret = krb5_cc_gen_new(context, ops, &fromid); ret = krb5_cc_new_unique(context, type, NULL, &fromid);
if (ret == KRB5_CC_NOSUPP) if (ret == KRB5_CC_NOSUPP)
return; return;
else if (ret) else if (ret)
krb5_err(context, 1, ret, "krb5_cc_gen_new"); krb5_err(context, 1, ret, "krb5_cc_new_unique");
ret = krb5_parse_name(context, "lha@SU.SE", &p); ret = krb5_parse_name(context, "lha@SU.SE", &p);
if (ret) if (ret)
@@ -488,9 +488,9 @@ test_move(krb5_context context, const char *type)
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_cc_initialize"); krb5_err(context, 1, ret, "krb5_cc_initialize");
ret = krb5_cc_gen_new(context, ops, &toid); ret = krb5_cc_new_unique(context, type, NULL, &toid);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_cc_gen_new"); krb5_err(context, 1, ret, "krb5_cc_new_unique");
ret = krb5_cc_initialize(context, toid, p); ret = krb5_cc_initialize(context, toid, p);
if (ret) if (ret)
@@ -631,20 +631,20 @@ main(int argc, char **argv)
if (ret) if (ret)
errx (1, "krb5_init_context failed: %d", ret); errx (1, "krb5_init_context failed: %d", ret);
test_cache_remove(context, &krb5_fcc_ops); test_cache_remove(context, krb5_cc_type_file);
test_cache_remove(context, &krb5_mcc_ops); test_cache_remove(context, krb5_cc_type_memory);
#ifdef USE_SQLITE #ifdef USE_SQLITE
test_cache_remove(context, &krb5_scc_ops); test_cache_remove(context, krb5_cc_type_scache);
#endif #endif
test_default_name(context); test_default_name(context);
test_mcache(context); test_mcache(context);
test_init_vs_destroy(context, &krb5_mcc_ops); test_init_vs_destroy(context, krb5_cc_type_memory);
test_init_vs_destroy(context, &krb5_fcc_ops); test_init_vs_destroy(context, krb5_cc_type_file);
#if 0 #if 0
test_init_vs_destroy(context, &krb5_acc_ops); test_init_vs_destroy(context, krb5_cc_type_api);
#endif #endif
test_init_vs_destroy(context, &krb5_scc_ops); test_init_vs_destroy(context, krb5_cc_type_scache);
test_mcc_default(); test_mcc_default();
test_def_cc_name(context); test_def_cc_name(context);