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

replace krb5_free_creds_contents by krb5_free_cred_contents

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/login/login.c
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.
*
@@ -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);

2
appl/popper/pop_pass.c
View File

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

2
appl/xnlock/xnlock.c
View File

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

4
kdc/hprop.c
View File

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

4
kpasswd/kpasswd-generator.c
View File

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

4
kpasswd/kpasswd.c
View File

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

4
kuser/copy_cred_cache.c
View File

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

4
kuser/generate-requests.c
View File

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

4
kuser/kdecode_ticket.c
View File

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

4
kuser/kgetcred.c
View File

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

4
kuser/kinit.c
View File

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

6
kuser/klist.c
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.
*
@@ -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;

4
kuser/kverify.c
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.
*
@@ -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;
}

4
lib/auth/afskauthlib/verify.c
View File

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

4
lib/gssapi/acquire_cred.c
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.
*
@@ -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)

4
lib/gssapi/krb5/acquire_cred.c
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.
*
@@ -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)

4
lib/kadm5/init_c.c
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.
*
@@ -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;
}

6
lib/krb5/cache.c
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);

8
lib/krb5/convert_creds.c
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;
}

11
lib/krb5/creds.c
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;
}

2
lib/krb5/get_cred.c
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;

10
lib/krb5/init_creds_pw.c
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;
}

4
lib/krb5/mcache.c
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;

6
lib/krb5/mk_req.c
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;

2
lib/krb5/store.c
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;

4
lib/krb5/verify_user.c
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;
}