From 4121fc049e8b129ce33c4ae6eeabb70bf0821014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 17 Apr 2004 08:43:40 +0000 Subject: [PATCH] merge certificate/private_key to a user_id git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13726 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/config.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/kdc/config.c b/kdc/config.c index a823e7197..c427b6337 100644 --- a/kdc/config.c +++ b/kdc/config.c @@ -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. * @@ -445,21 +445,14 @@ configure(int argc, char **argv) "enable-pkinit", NULL); if (enable_pkinit) { - const char *key_file, *certificate_file, *x509_anchors; + const char *user_id, *x509_anchors; - key_file = krb5_config_get_string(context, NULL, + user_id = krb5_config_get_string(context, NULL, "kdc", - "pki-key-file", + "pki-identity", NULL); - if (key_file == NULL) - krb5_errx(context, 1, "pkinit enabled but no keyfile"); - - certificate_file = krb5_config_get_string(context, NULL, - "kdc", - "pki-certificate", - NULL); - if (certificate_file == NULL) - krb5_errx(context, 1, "pkinit enabled but no certificate"); + if (user_id == NULL) + krb5_errx(context, 1, "pkinit enabled but no identity"); x509_anchors = krb5_config_get_string(context, NULL, "kdc", @@ -468,7 +461,7 @@ configure(int argc, char **argv) if (x509_anchors == NULL) krb5_errx(context, 1, "pkinit enabled but no X509 anchors"); - pk_initialize(certificate_file, key_file, x509_anchors); + pk_initialize(user_id, x509_anchors); } #endif