replace krb5_free_creds_contents by krb5_free_cred_contents

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13790 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-04-25 19:25:35 +00:00
parent 76a580ad8a
commit 26457b7135
26 changed files with 60 additions and 59 deletions

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
}