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

Avoid shadowing.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17579 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-13 21:22:55 +00:00
parent b0c4de9278
commit 4c970b550e
5 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
kdc/config.c
View File

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

7
kdc/pkinit.c
View File

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