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

Avoid more shadowing.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17606 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-06-01 18:17:58 +00:00
parent 168c9202f3
commit d60350c3a1
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/pkinit.c
View File

@@ -69,7 +69,7 @@ struct krb5_pk_identity {
hx509_certs certs; hx509_certs certs;
hx509_certs anchors; hx509_certs anchors;
hx509_certs certpool; hx509_certs certpool;
hx509_revoke_ctx revoke; hx509_revoke_ctx revokectx;
}; };
struct krb5_pk_cert { struct krb5_pk_cert {
@@ -1439,14 +1439,16 @@ _krb5_pk_load_id(krb5_context context,
} }
if (revoke_list) { if (revoke_list) {
ret = hx509_revoke_init(id->hx509ctx, &id->revoke); ret = hx509_revoke_init(id->hx509ctx, &id->revokectx);
if (ret) { if (ret) {
krb5_set_error_string(context, "revoke failed to init"); krb5_set_error_string(context, "revoke failed to init");
goto out; goto out;
} }
while (*revoke_list) { while (*revoke_list) {
ret = hx509_revoke_add_crl(id->hx509ctx, id->revoke, *revoke_list); ret = hx509_revoke_add_crl(id->hx509ctx,
id->revokectx,
*revoke_list);
if (ret) { if (ret) {
krb5_set_error_string(context, krb5_set_error_string(context,
"pkinit failed to load revoke %s", "pkinit failed to load revoke %s",
@@ -1463,7 +1465,7 @@ _krb5_pk_load_id(krb5_context context,
goto out; goto out;
hx509_verify_attach_anchors(id->verify_ctx, id->anchors); hx509_verify_attach_anchors(id->verify_ctx, id->anchors);
hx509_verify_attach_revoke(id->verify_ctx, id->revoke); hx509_verify_attach_revoke(id->verify_ctx, id->revokectx);
out: out:
if (ret) { if (ret) {
@@ -1471,7 +1473,7 @@ out:
hx509_certs_free(&id->certs); hx509_certs_free(&id->certs);
hx509_certs_free(&id->anchors); hx509_certs_free(&id->anchors);
hx509_certs_free(&id->certpool); hx509_certs_free(&id->certpool);
hx509_revoke_free(&id->revoke); hx509_revoke_free(&id->revokectx);
hx509_context_free(&id->hx509ctx); hx509_context_free(&id->hx509ctx);
free(id); free(id);
} else } else
@@ -1779,7 +1781,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
const char *user_id, const char *user_id,
const char *x509_anchors, const char *x509_anchors,
char * const * pool, char * const * pool,
char * const * revoke, char * const * pki_revoke,
int flags, int flags,
krb5_prompter_fct prompter, krb5_prompter_fct prompter,
void *prompter_data, void *prompter_data,
@@ -1815,8 +1817,8 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
"pkinit-pool", "pkinit-pool",
NULL); NULL);
if (revoke == NULL) if (pki_revoke == NULL)
revoke = krb5_config_get_strings(context, NULL, pki_revoke = krb5_config_get_strings(context, NULL,
"appdefaults", "appdefaults",
"pkinit-revoke", "pkinit-revoke",
NULL); NULL);
@@ -1833,7 +1835,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
user_id, user_id,
x509_anchors, x509_anchors,
pool, pool,
revoke, pki_revoke,
prompter, prompter,
prompter_data, prompter_data,
password); password);