diff --git a/appl/login/login.c b/appl/login/login.c index aa9f5585f..d346ebe0a 100644 --- a/appl/login/login.c +++ b/appl/login/login.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -232,7 +232,7 @@ krb5_to4 (krb5_ccache id) tf_setup(&c, c.pname, c.pinst); } memset(&c, 0, sizeof(c)); - krb5_free_creds_contents(context, &cred); + krb5_free_cred_contents(context, &cred); } krb5_free_principal(context, mcred.server); krb5_free_principal(context, mcred.client); diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c index 67fa3de41..7a89ae5a3 100644 --- a/appl/popper/pop_pass.c +++ b/appl/popper/pop_pass.c @@ -100,7 +100,7 @@ krb5_verify_password (POP *p) &verify_options); krb5_free_principal (p->context, client); krb5_free_principal (p->context, server); - krb5_free_creds_contents (p->context, &creds); + krb5_free_cred_contents (p->context, &creds); return ret; } #endif diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c index 2ae2a4169..44defc727 100644 --- a/appl/xnlock/xnlock.c +++ b/appl/xnlock/xnlock.c @@ -611,7 +611,7 @@ verify_krb5(const char *password) if(ret == 0) tf_setup(&c, c.pname, c.pinst); memset(&c, 0, sizeof(c)); - krb5_free_creds_contents(context, &cred); + krb5_free_cred_contents(context, &cred); } krb5_free_principal(context, mcred.server); } diff --git a/kdc/hprop.c b/kdc/hprop.c index 0a25e4b9b..7973a26f6 100644 --- a/kdc/hprop.c +++ b/kdc/hprop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -540,7 +540,7 @@ get_creds(krb5_context context, krb5_ccache *cache) ret = krb5_cc_store_cred(context, *cache, &creds); if(ret) krb5_err(context, 1, ret, "krb5_cc_store_cred"); - krb5_free_creds_contents(context, &creds); + krb5_free_cred_contents(context, &creds); } enum hprop_source { diff --git a/kpasswd/kpasswd-generator.c b/kpasswd/kpasswd-generator.c index d33711a54..57d1c5c90 100644 --- a/kpasswd/kpasswd-generator.c +++ b/kpasswd/kpasswd-generator.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 2000 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -148,7 +148,7 @@ generate_requests (const char *filename, unsigned nreq) free (old_pwd); free (new_pwd); - krb5_free_creds_contents (context, &cred); + krb5_free_cred_contents (context, &cred); krb5_get_init_creds_opt_free(opt); } } diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c index 065642a6f..3210664a8 100644 --- a/kpasswd/kpasswd.c +++ b/kpasswd/kpasswd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2001, 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -198,7 +198,7 @@ main (int argc, char **argv) if (ret) krb5_err(context, 1, ret, "krb5_cc_store_cred"); - krb5_free_creds_contents (context, &cred); + krb5_free_cred_contents (context, &cred); if (argc == 0) { exit_value = change_password(context, NULL, id); diff --git a/kuser/copy_cred_cache.c b/kuser/copy_cred_cache.c index 7e880f1b2..7b8cb05ef 100644 --- a/kuser/copy_cred_cache.c +++ b/kuser/copy_cred_cache.c @@ -185,7 +185,7 @@ krb5_cc_next_cred_match(krb5_context context, return ret; if (mcreds == NULL || krb5_compare_creds2(context, whichfields, mcreds, creds)) return 0; - krb5_free_creds_contents(context, creds); + krb5_free_cred_contents(context, creds); } } @@ -223,7 +223,7 @@ krb5_cc_copy_cache_match(krb5_context context, if (matched) (*matched)++; ret = krb5_cc_store_cred(context, to, &cred); - krb5_free_creds_contents(context, &cred); + krb5_free_cred_contents(context, &cred); } krb5_cc_end_seq_get(context, from, &cursor); krb5_free_principal(context, princ); diff --git a/kuser/generate-requests.c b/kuser/generate-requests.c index 0963d1a4f..ecb85f86a 100644 --- a/kuser/generate-requests.c +++ b/kuser/generate-requests.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 2000 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -105,7 +105,7 @@ generate_requests (const char *filename, unsigned nreq) ret = krb5_get_in_cred (context, 0, NULL, NULL, NULL, NULL, null_key_proc, NULL, NULL, NULL, &cred, NULL); - krb5_free_creds_contents (context, &cred); + krb5_free_cred_contents (context, &cred); } } diff --git a/kuser/kdecode_ticket.c b/kuser/kdecode_ticket.c index f220ad541..e72c6e4ec 100644 --- a/kuser/kdecode_ticket.c +++ b/kuser/kdecode_ticket.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -157,6 +157,6 @@ main(int argc, char **argv) print_and_decode_tkt (context, &out->ticket, out->server, out->session.keytype); - krb5_free_creds_contents(context, out); + krb5_free_cred_contents(context, out); return 0; } diff --git a/kuser/kgetcred.c b/kuser/kgetcred.c index 293c69ccc..3b8d6e47f 100644 --- a/kuser/kgetcred.c +++ b/kuser/kgetcred.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -129,6 +129,6 @@ main(int argc, char **argv) if (ret) krb5_err (context, 1, ret, "krb5_get_credentials"); - krb5_free_creds_contents(context, out); + krb5_free_cred_contents(context, out); return 0; } diff --git a/kuser/kinit.c b/kuser/kinit.c index d9de4e703..1f9b1e714 100644 --- a/kuser/kinit.c +++ b/kuser/kinit.c @@ -421,7 +421,7 @@ renew_validate(krb5_context context, goto out; } out: - krb5_free_creds_contents(context, &in); + krb5_free_cred_contents(context, &in); return ret; } @@ -626,7 +626,7 @@ get_new_tickets(krb5_context context, if (ret) krb5_err (context, 1, ret, "krb5_cc_store_cred"); - krb5_free_creds_contents (context, &cred); + krb5_free_cred_contents (context, &cred); return 0; } diff --git a/kuser/klist.c b/kuser/klist.c index 2d244537e..28f530299 100644 --- a/kuser/klist.c +++ b/kuser/klist.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -282,7 +282,7 @@ print_tickets (krb5_context context, }else{ print_cred(context, &creds, ct, do_flags); } - krb5_free_creds_contents (context, &creds); + krb5_free_cred_contents (context, &creds); } if(ret != KRB5_CC_END) krb5_err(context, 1, ret, "krb5_cc_get_next"); @@ -325,7 +325,7 @@ check_for_tgt (krb5_context context, ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds); expired = time(NULL) > creds.times.endtime; krb5_free_principal (context, pattern.server); - krb5_free_creds_contents (context, &creds); + krb5_free_cred_contents (context, &creds); if (ret) { if (ret == KRB5_CC_END) return 1; diff --git a/kuser/kverify.c b/kuser/kverify.c index 0e47b9061..e6c6d54a9 100644 --- a/kuser/kverify.c +++ b/kuser/kverify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -112,7 +112,7 @@ main(int argc, char **argv) if (ret) errx (1, "krb5_verify_init_creds: %s", krb5_get_err_text(context, ret)); - krb5_free_creds_contents (context, &cred); + krb5_free_cred_contents (context, &cred); krb5_free_context (context); return 0; } diff --git a/lib/auth/afskauthlib/verify.c b/lib/auth/afskauthlib/verify.c index a679bda4a..c45b764ae 100644 --- a/lib/auth/afskauthlib/verify.c +++ b/lib/auth/afskauthlib/verify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2000 Kungliga Tekniska Högskolan + * Copyright (c) 1995-2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -189,7 +189,7 @@ verify_krb5(struct passwd *pwd, tf_setup(&c, c.pname, c.pinst); } memset(&c, 0, sizeof(c)); - krb5_free_creds_contents(context, &cred); + krb5_free_cred_contents(context, &cred); } else syslog(LOG_AUTH|LOG_DEBUG, "krb5_cc_retrieve_cred: %s", krb5_get_err_text(context, ret)); diff --git a/lib/gssapi/acquire_cred.c b/lib/gssapi/acquire_cred.c index db55a102e..3da43b116 100644 --- a/lib/gssapi/acquire_cred.c +++ b/lib/gssapi/acquire_cred.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -170,7 +170,7 @@ static OM_uint32 acquire_initiator_cred end: if (cred.client != NULL) - krb5_free_creds_contents(gssapi_krb5_context, &cred); + krb5_free_cred_contents(gssapi_krb5_context, &cred); if (def_princ != NULL) krb5_free_principal(gssapi_krb5_context, def_princ); if (keytab != NULL) diff --git a/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c index db55a102e..3da43b116 100644 --- a/lib/gssapi/krb5/acquire_cred.c +++ b/lib/gssapi/krb5/acquire_cred.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -170,7 +170,7 @@ static OM_uint32 acquire_initiator_cred end: if (cred.client != NULL) - krb5_free_creds_contents(gssapi_krb5_context, &cred); + krb5_free_cred_contents(gssapi_krb5_context, &cred); if (def_princ != NULL) krb5_free_principal(gssapi_krb5_context, def_princ); if (keytab != NULL) diff --git a/lib/kadm5/init_c.c b/lib/kadm5/init_c.c index 05ac7c15a..321debb5e 100644 --- a/lib/kadm5/init_c.c +++ b/lib/kadm5/init_c.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -219,7 +219,7 @@ get_new_cache(krb5_context context, ret = krb5_cc_store_cred (context, id, &cred); if (ret) return ret; - krb5_free_creds_contents (context, &cred); + krb5_free_cred_contents (context, &cred); *ret_cache = id; return 0; } diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c index 7c6ad0c11..4437f917d 100644 --- a/lib/krb5/cache.c +++ b/lib/krb5/cache.c @@ -330,7 +330,7 @@ krb5_cc_retrieve_cred(krb5_context context, ret = 0; break; } - krb5_free_creds_contents (context, creds); + krb5_free_cred_contents (context, creds); } krb5_cc_end_seq_get(context, id, &cursor); return ret; @@ -395,7 +395,7 @@ krb5_cc_next_cred_match(krb5_context context, return ret; if (mcreds == NULL || krb5_compare_creds(context, whichfields, mcreds, creds)) return 0; - krb5_free_creds_contents(context, creds); + krb5_free_cred_contents(context, creds); } } @@ -480,7 +480,7 @@ krb5_cc_copy_cache_match(krb5_context context, if (matched) (*matched)++; ret = krb5_cc_store_cred(context, to, &cred); - krb5_free_creds_contents(context, &cred); + krb5_free_cred_contents(context, &cred); } krb5_cc_end_seq_get(context, from, &cursor); krb5_free_principal(context, princ); diff --git a/lib/krb5/convert_creds.c b/lib/krb5/convert_creds.c index fbd6dd782..eaae16b6d 100644 --- a/lib/krb5/convert_creds.c +++ b/lib/krb5/convert_creds.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -430,18 +430,18 @@ krb524_convert_creds_kdc_ccache(krb5_context context, template.session.keytype = ENCTYPE_DES_CBC_CRC; ret = krb5_copy_principal (context, in_cred->client, &template.client); if (ret) { - krb5_free_creds_contents (context, &template); + krb5_free_cred_contents (context, &template); return ret; } ret = krb5_copy_principal (context, in_cred->server, &template.server); if (ret) { - krb5_free_creds_contents (context, &template); + krb5_free_cred_contents (context, &template); return ret; } ret = krb5_get_credentials (context, 0, ccache, &template, &v5_creds); - krb5_free_creds_contents (context, &template); + krb5_free_cred_contents (context, &template); if (ret) return ret; } diff --git a/lib/krb5/creds.c b/lib/krb5/creds.c index 109b5e613..367f5cc4f 100644 --- a/lib/krb5/creds.c +++ b/lib/krb5/creds.c @@ -35,14 +35,15 @@ RCSID("$Id$"); +/* keep this for compatibility with older code */ krb5_error_code -krb5_free_cred_contents (krb5_context context, krb5_creds *c) +krb5_free_creds_contents (krb5_context context, krb5_creds *c) { - return krb5_free_creds_contents (context, c); + return krb5_free_cred_contents (context, c); } krb5_error_code -krb5_free_creds_contents (krb5_context context, krb5_creds *c) +krb5_free_cred_contents (krb5_context context, krb5_creds *c) { krb5_free_principal (context, c->client); c->client = NULL; @@ -96,7 +97,7 @@ krb5_copy_creds_contents (krb5_context context, return 0; fail: - krb5_free_creds_contents (context, c); + krb5_free_cred_contents (context, c); return ret; } @@ -120,7 +121,7 @@ krb5_copy_creds (krb5_context context, krb5_error_code krb5_free_creds (krb5_context context, krb5_creds *c) { - krb5_free_creds_contents (context, c); + krb5_free_cred_contents (context, c); free (c); return 0; } diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c index 817a53b96..c52cd779a 100644 --- a/lib/krb5/get_cred.c +++ b/lib/krb5/get_cred.c @@ -710,7 +710,7 @@ get_cred_from_kdc_flags(krb5_context context, *out_creds = NULL; } } - krb5_free_creds_contents(context, &tgts); + krb5_free_cred_contents(context, &tgts); krb5_free_principal(context, tmp_creds.server); krb5_free_principal(context, tmp_creds.client); return ret; diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c index 0f81b2375..8cde28a22 100644 --- a/lib/krb5/init_creds_pw.c +++ b/lib/krb5/init_creds_pw.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -206,7 +206,7 @@ init_cred (krb5_context context, return 0; out: - krb5_free_creds_contents (context, cred); + krb5_free_cred_contents (context, cred); return ret; } @@ -455,7 +455,7 @@ out: memset (buf2, 0, sizeof(buf2)); krb5_data_free (&result_string); krb5_data_free (&result_code_string); - krb5_free_creds_contents (context, &cpw_cred); + krb5_free_cred_contents (context, &cpw_cred); return ret; } @@ -517,7 +517,7 @@ krb5_get_init_creds_keytab(krb5_context context, if (ret == 0 && creds) *creds = ctx.cred; else - krb5_free_creds_contents (context, &ctx.cred); + krb5_free_cred_contents (context, &ctx.cred); out: free_init_creds_ctx(context, &ctx); @@ -1437,7 +1437,7 @@ krb5_get_init_creds(krb5_context context, *creds = ctx.cred; krb5_free_kdc_rep (context, &kdc_reply); } else - krb5_free_creds_contents (context, &ctx.cred); + krb5_free_cred_contents (context, &ctx.cred); return ret; } diff --git a/lib/krb5/mcache.c b/lib/krb5/mcache.c index 14bd32719..1465addeb 100644 --- a/lib/krb5/mcache.c +++ b/lib/krb5/mcache.c @@ -210,7 +210,7 @@ mcc_destroy(krb5_context context, while (l != NULL) { struct link *old; - krb5_free_creds_contents (context, &l->cred); + krb5_free_cred_contents (context, &l->cred); old = l; l = l->next; free (old); @@ -318,7 +318,7 @@ mcc_remove_cred(krb5_context context, for(q = &m->creds, p = *q; p; p = *q) { if(krb5_compare_creds(context, which, mcreds, &p->cred)) { *q = p->next; - krb5_free_creds_contents(context, &p->cred); + krb5_free_cred_contents(context, &p->cred); free(p); } else q = &p->next; diff --git a/lib/krb5/mk_req.c b/lib/krb5/mk_req.c index f46dce632..388d539fb 100644 --- a/lib/krb5/mk_req.c +++ b/lib/krb5/mk_req.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -56,7 +56,7 @@ krb5_mk_req_exact(krb5_context context, ret = krb5_copy_principal (context, server, &this_cred.server); if (ret) { - krb5_free_creds_contents (context, &this_cred); + krb5_free_cred_contents (context, &this_cred); return ret; } @@ -65,7 +65,7 @@ krb5_mk_req_exact(krb5_context context, this_cred.session.keytype = (*auth_context)->keytype; ret = krb5_get_credentials (context, 0, ccache, &this_cred, &cred); - krb5_free_creds_contents(context, &this_cred); + krb5_free_cred_contents(context, &this_cred); if (ret) return ret; diff --git a/lib/krb5/store.c b/lib/krb5/store.c index b24312543..6e1b06509 100644 --- a/lib/krb5/store.c +++ b/lib/krb5/store.c @@ -716,7 +716,7 @@ krb5_ret_creds(krb5_storage *sp, krb5_creds *creds) cleanup: if(ret) { #if 0 - krb5_free_creds_contents(context, creds); /* XXX */ + krb5_free_cred_contents(context, creds); /* XXX */ #endif } return ret; diff --git a/lib/krb5/verify_user.c b/lib/krb5/verify_user.c index 9521ce3e1..31fd83ccd 100644 --- a/lib/krb5/verify_user.c +++ b/lib/krb5/verify_user.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -78,7 +78,7 @@ verify_common (krb5_context context, if(ccache == NULL) krb5_cc_close(context, id); } - krb5_free_creds_contents(context, &cred); + krb5_free_cred_contents(context, &cred); return ret; }