From 4c970b550e68687decfc05ab9b73a2e21c796fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 13 May 2006 21:22:55 +0000 Subject: [PATCH] Avoid shadowing. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17579 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/config.c | 45 ++++++++++++++++++++++++------------------- kdc/pkinit.c | 7 +++---- lib/kadm5/iprop-log.c | 26 ++++++++++++------------- lib/kadm5/rename_s.c | 12 ++++++------ lib/krb5/pkinit.c | 23 +++++++++++----------- 5 files changed, 59 insertions(+), 54 deletions(-) diff --git a/kdc/config.c b/kdc/config.c index 9254e12a2..76802d72c 100644 --- a/kdc/config.c +++ b/kdc/config.c @@ -501,8 +501,8 @@ configure(krb5_context context, int argc, char **argv) "enable-pkinit", NULL); if (config->enable_pkinit) { - const char *user_id, *anchors; - char **pool, **revoke; + const char *user_id, *anchors, *ocsp_file; + char **pool_list, **revoke_list; user_id = krb5_config_get_string(context, NULL, "kdc", @@ -518,26 +518,31 @@ configure(krb5_context context, int argc, char **argv) if (anchors == NULL) krb5_errx(context, 1, "pkinit enabled but no X509 anchors"); - pool = krb5_config_get_strings(context, NULL, - "kdc", - "pki-pool", - NULL); + pool_list = krb5_config_get_strings(context, NULL, + "kdc", + "pki-pool", + NULL); - revoke = krb5_config_get_strings(context, NULL, - "kdc", - "pki-revoke", - NULL); + revoke_list = krb5_config_get_strings(context, NULL, + "kdc", + "pki-revoke", + NULL); - config->pkinit_kdc_ocsp_file = + ocsp_file = krb5_config_get_string(context, NULL, "kdc", "pki-kdc-ocsp", NULL); + if (ocsp_file) { + config->pkinit_kdc_ocsp_file = strdup(ocsp_file); + if (config->pkinit_kdc_ocsp_file == NULL) + krb5_errx(context, 1, "out of memory"); + } + _kdc_pk_initialize(context, config, user_id, anchors, + pool_list, revoke_list); - _kdc_pk_initialize(context, config, user_id, anchors, pool, revoke); - - krb5_config_free_strings(pool); - krb5_config_free_strings(revoke); + krb5_config_free_strings(pool_list); + krb5_config_free_strings(revoke_list); config->enable_pkinit_princ_in_cert = krb5_config_get_bool_default(context, @@ -550,11 +555,11 @@ configure(krb5_context context, int argc, char **argv) config->pkinit_dh_min_bits = krb5_config_get_int_default(context, - NULL, - 0, - "kdc", - "pkinit-dh-min-bits", - NULL); + NULL, + 0, + "kdc", + "pkinit-dh-min-bits", + NULL); #endif diff --git a/kdc/pkinit.c b/kdc/pkinit.c index 1c31887aa..920efd7ab 100644 --- a/kdc/pkinit.c +++ b/kdc/pkinit.c @@ -426,7 +426,7 @@ _kdc_pk_rd_padata(krb5_context context, krb5_data signed_content = { 0, NULL }; const char *type = "unknown type"; const heim_oid *pa_contentType; - int have_data; + int have_data = 0; *ret_params = NULL; @@ -444,7 +444,6 @@ _kdc_pk_rd_padata(krb5_context context, if (pa->padata_type == KRB5_PADATA_PK_AS_REQ_WIN) { PA_PK_AS_REQ_Win2k r; - int have_data; type = "PK-INIT-Win2k"; pa_contentType = oid_id_pkcs7_data(); @@ -1282,7 +1281,7 @@ _kdc_pk_initialize(krb5_context context, const char *user_id, const char *anchors, char **pool, - char **revoke) + char **revoke_list) { const char *file; krb5_error_code ret; @@ -1305,7 +1304,7 @@ _kdc_pk_initialize(krb5_context context, user_id, anchors, pool, - revoke, + revoke_list, NULL, NULL, NULL); diff --git a/lib/kadm5/iprop-log.c b/lib/kadm5/iprop-log.c index fe9d914f1..c81a0ac12 100644 --- a/lib/kadm5/iprop-log.c +++ b/lib/kadm5/iprop-log.c @@ -111,7 +111,7 @@ print_entry(kadm5_server_context *server_context, krb5_principal source; char *name1, *name2; krb5_data data; - krb5_context context = server_context->context; + krb5_context scontext = server_context->context; off_t end = krb5_storage_seek(sp, 0, SEEK_CUR) + len; @@ -130,32 +130,32 @@ print_entry(kadm5_server_context *server_context, switch(op) { case kadm_delete: krb5_ret_principal(sp, &source); - krb5_unparse_name(context, source, &name1); + krb5_unparse_name(scontext, source, &name1); printf(" %s\n", name1); free(name1); - krb5_free_principal(context, source); + krb5_free_principal(scontext, source); break; case kadm_rename: ret = krb5_data_alloc(&data, len); if (ret) - krb5_err (context, 1, ret, "kadm_rename: data alloc: %d", len); + krb5_err (scontext, 1, ret, "kadm_rename: data alloc: %d", len); krb5_ret_principal(sp, &source); krb5_storage_read(sp, data.data, data.length); - hdb_value2entry(context, &data, &ent); - krb5_unparse_name(context, source, &name1); - krb5_unparse_name(context, ent.principal, &name2); + hdb_value2entry(scontext, &data, &ent); + krb5_unparse_name(scontext, source, &name1); + krb5_unparse_name(scontext, ent.principal, &name2); printf(" %s -> %s\n", name1, name2); free(name1); free(name2); - krb5_free_principal(context, source); + krb5_free_principal(scontext, source); free_hdb_entry(&ent); break; case kadm_create: ret = krb5_data_alloc(&data, len); if (ret) - krb5_err (context, 1, ret, "kadm_create: data alloc: %d", len); + krb5_err (scontext, 1, ret, "kadm_create: data alloc: %d", len); krb5_storage_read(sp, data.data, data.length); - ret = hdb_value2entry(context, &data, &ent); + ret = hdb_value2entry(scontext, &data, &ent); if(ret) abort(); mask = ~0; @@ -163,15 +163,15 @@ print_entry(kadm5_server_context *server_context, case kadm_modify: ret = krb5_data_alloc(&data, len); if (ret) - krb5_err (context, 1, ret, "kadm_modify: data alloc: %d", len); + krb5_err (scontext, 1, ret, "kadm_modify: data alloc: %d", len); krb5_ret_int32(sp, &mask); krb5_storage_read(sp, data.data, data.length); - ret = hdb_value2entry(context, &data, &ent); + ret = hdb_value2entry(scontext, &data, &ent); if(ret) abort(); foo: if(ent.principal /* mask & KADM5_PRINCIPAL */) { - krb5_unparse_name(context, ent.principal, &name1); + krb5_unparse_name(scontext, ent.principal, &name1); printf(" principal = %s\n", name1); free(name1); } diff --git a/lib/kadm5/rename_s.c b/lib/kadm5/rename_s.c index 5b1e285b0..c999599d3 100644 --- a/lib/kadm5/rename_s.c +++ b/lib/kadm5/rename_s.c @@ -43,7 +43,7 @@ kadm5_s_rename_principal(void *server_handle, kadm5_server_context *context = server_handle; kadm5_ret_t ret; hdb_entry_ex ent; - krb5_principal remove = NULL; + krb5_principal oldname; memset(&ent, 0, sizeof(ent)); if(krb5_principal_compare(context->context, source, target)) @@ -81,12 +81,12 @@ kadm5_s_rename_principal(void *server_handle, } if(ret) goto out2; - remove = ent.entry.principal; + oldname = ent.entry.principal; ent.entry.principal = target; ret = hdb_seal_keys(context->context, context->db, &ent.entry); if (ret) { - ent.entry.principal = remove; + ent.entry.principal = oldname; goto out2; } @@ -96,11 +96,11 @@ kadm5_s_rename_principal(void *server_handle, ret = context->db->hdb_store(context->context, context->db, 0, &ent); if(ret){ - ent.entry.principal = remove; + ent.entry.principal = oldname; goto out2; } - ret = context->db->hdb_remove(context->context, context->db, remove); - ent.entry.principal = remove; + ret = context->db->hdb_remove(context->context, context->db, oldname); + ent.entry.principal = oldname; out2: context->db->hdb_close(context->context, context->db); hdb_free_entry(context->context, &ent); diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c index 1a732b4c3..a2aa6b9bd 100644 --- a/lib/krb5/pkinit.c +++ b/lib/krb5/pkinit.c @@ -1362,8 +1362,8 @@ _krb5_pk_load_id(krb5_context context, struct krb5_pk_identity **ret_id, const char *user_id, const char *anchor_id, - char * const *chain, - char * const *revoke, + char * const *chain_list, + char * const *revoke_list, krb5_prompter_fct prompter, void *prompter_data, char *password) @@ -1426,33 +1426,34 @@ _krb5_pk_load_id(krb5_context context, if (ret) goto out; - while (chain && *chain) { - ret = hx509_certs_append(id->hx509ctx, id->certpool, NULL, *chain); + while (chain_list && *chain_list) { + ret = hx509_certs_append(id->hx509ctx, id->certpool, + NULL, *chain_list); if (ret) { krb5_set_error_string(context, "pkinit failed to load chain %s", - *chain); + *chain_list); goto out; } - chain++; + chain_list++; } - if (revoke) { + if (revoke_list) { ret = hx509_revoke_init(id->hx509ctx, &id->revoke); if (ret) { krb5_set_error_string(context, "revoke failed to init"); goto out; } - while (*revoke) { - ret = hx509_revoke_add_crl(id->hx509ctx, id->revoke, *revoke); + while (*revoke_list) { + ret = hx509_revoke_add_crl(id->hx509ctx, id->revoke, *revoke_list); if (ret) { krb5_set_error_string(context, "pkinit failed to load revoke %s", - *revoke); + *revoke_list); goto out; } - revoke++; + revoke_list++; } } else hx509_context_set_missing_revoke(id->hx509ctx, 1);