1 files changed, 265 insertions, 180 deletions
diff --git a/lib/krb5/verify_krb5_conf.c b/lib/krb5/verify_krb5_conf.c
index 647a311a2ca6..0db8807a4a12 100644
--- a/lib/krb5/verify_krb5_conf.c
+++ b/lib/krb5/verify_krb5_conf.c
@@ -163,22 +163,22 @@ check_host(krb5_context context, const char *path, char *data)
 
     /* XXX data could be a list of hosts that this code can't handle */
     /* XXX copied from krbhst.c */
-    if(strncmp(p, "http://", 7) == 0){
+    if (strncmp(p, "http://", 7) == 0){
         p += 7;
 	hints.ai_socktype = SOCK_STREAM;
 	strlcpy(service, "http", sizeof(service));
 	defport = 80;
-    } else if(strncmp(p, "http/", 5) == 0) {
+    } else if (strncmp(p, "http/", 5) == 0) {
         p += 5;
 	hints.ai_socktype = SOCK_STREAM;
 	strlcpy(service, "http", sizeof(service));
 	defport = 80;
-    }else if(strncmp(p, "tcp/", 4) == 0){
+    } else if (strncmp(p, "tcp/", 4) == 0){
         p += 4;
 	hints.ai_socktype = SOCK_STREAM;
 	strlcpy(service, "kerberos", sizeof(service));
 	defport = 88;
-    } else if(strncmp(p, "udp/", 4) == 0) {
+    } else if (strncmp(p, "udp/", 4) == 0) {
         p += 4;
 	hints.ai_socktype = SOCK_DGRAM;
 	strlcpy(service, "kerberos", sizeof(service));
@@ -188,14 +188,14 @@ check_host(krb5_context context, const char *path, char *data)
 	strlcpy(service, "kerberos", sizeof(service));
 	defport = 88;
     }
-    if(strsep_copy(&p, ":", hostname, sizeof(hostname)) < 0) {
+    if (strsep_copy(&p, ":", hostname, sizeof(hostname)) < 0) {
 	return 1;
     }
     hostname[strcspn(hostname, "/")] = '\0';
-    if(p != NULL) {
+    if (p != NULL) {
 	char *end;
 	int tmp = strtol(p, &end, 0);
-	if(end == p) {
+	if (end == p) {
 	    krb5_warnx(context, "%s: failed to parse port number in %s",
 		       path, data);
 	    return 1;
@@ -204,14 +204,15 @@ check_host(krb5_context context, const char *path, char *data)
 	snprintf(service, sizeof(service), "%u", defport);
     }
     ret = getaddrinfo(hostname, service, &hints, &ai);
-    if(ret == EAI_SERVICE && !isdigit((unsigned char)service[0])) {
+    if (ret == EAI_SERVICE && !isdigit((unsigned char)service[0])) {
 	snprintf(service, sizeof(service), "%u", defport);
 	ret = getaddrinfo(hostname, service, &hints, &ai);
     }
-    if(ret != 0) {
+    if (ret != 0) {
 	krb5_warnx(context, "%s: %s (%s)", path, gai_strerror(ret), hostname);
 	return 1;
     }
+    freeaddrinfo(ai);
     return 0;
 }
 
@@ -289,10 +290,13 @@ check_log(krb5_context context, const char *path, char *data)
     int min = 0, max = -1, n;
     char c;
     const char *p = data;
+#ifdef _WIN32
+    const char *q;
+#endif
 
     n = sscanf(p, "%d%c%d/", &min, &c, &max);
     if(n == 2){
-	if(c == '/') {
+	if(ISPATHSEP(c)) {
 	    if(min < 0){
 		max = -min;
 		min = 0;
@@ -302,6 +306,12 @@ check_log(krb5_context context, const char *path, char *data)
 	}
     }
     if(n){
+#ifdef _WIN32
+	q = strrchr(p, '\\');
+	if (q != NULL)
+	    p = q;
+	else
+#endif
 	p = strchr(p, '/');
 	if(p == NULL) {
 	    krb5_warnx(context, "%s: failed to parse \"%s\"", path, data);
@@ -327,7 +337,7 @@ check_log(krb5_context context, const char *path, char *data)
 	    strlcpy(severity, "ERR", sizeof(severity));
  	if(*facility == '\0')
 	    strlcpy(facility, "AUTH", sizeof(facility));
-	if(find_value(severity, syslogvals) == -1) {
+	if(find_value(facility, syslogvals) == -1) {
 	    krb5_warnx(context, "%s: unknown syslog facility \"%s\"",
 		       path, facility);
 	    ret++;
@@ -353,227 +363,302 @@ struct entry {
 };
 
 struct entry all_strings[] = {
-    { "", krb5_config_string, NULL },
-    { NULL }
+    { "", krb5_config_string, NULL, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry all_boolean[] = {
-    { "", krb5_config_string, check_boolean },
-    { NULL }
+    { "", krb5_config_string, check_boolean, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 
 struct entry v4_name_convert_entries[] = {
-    { "host", krb5_config_list, all_strings },
-    { "plain", krb5_config_list, all_strings },
-    { NULL }
+    { "host", krb5_config_list, all_strings, 0 },
+    { "plain", krb5_config_list, all_strings, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry libdefaults_entries[] = {
-    { "accept_null_addresses", krb5_config_string, check_boolean },
-    { "allow_weak_crypto", krb5_config_string, check_boolean },
+    { "accept_null_addresses", krb5_config_string, check_boolean, 0 },
+    { "allow_weak_crypto", krb5_config_string, check_boolean, 0 },
     { "capath", krb5_config_list, all_strings, 1 },
-    { "check_pac", krb5_config_string, check_boolean },
-    { "clockskew", krb5_config_string, check_time },
-    { "date_format", krb5_config_string, NULL },
-    { "default_cc_name", krb5_config_string, NULL },
-    { "default_etypes", krb5_config_string, NULL },
-    { "default_etypes_des", krb5_config_string, NULL },
-    { "default_keytab_modify_name", krb5_config_string, NULL },
-    { "default_keytab_name", krb5_config_string, NULL },
-    { "default_realm", krb5_config_string, NULL },
-    { "dns_canonize_hostname", krb5_config_string, check_boolean },
-    { "dns_proxy", krb5_config_string, NULL },
-    { "dns_lookup_kdc", krb5_config_string, check_boolean },
-    { "dns_lookup_realm", krb5_config_string, check_boolean },
-    { "dns_lookup_realm_labels", krb5_config_string, NULL },
-    { "egd_socket", krb5_config_string, NULL },
-    { "encrypt", krb5_config_string, check_boolean },
-    { "extra_addresses", krb5_config_string, NULL },
-    { "fcache_version", krb5_config_string, check_numeric },
-    { "fcc-mit-ticketflags", krb5_config_string, check_boolean },
-    { "forward", krb5_config_string, check_boolean },
-    { "forwardable", krb5_config_string, check_boolean },
-    { "http_proxy", krb5_config_string, check_host /* XXX */ },
-    { "ignore_addresses", krb5_config_string, NULL },
-    { "kdc_timeout", krb5_config_string, check_time },
-    { "kdc_timesync", krb5_config_string, check_boolean },
-    { "log_utc", krb5_config_string, check_boolean },
-    { "maxretries", krb5_config_string, check_numeric },
-    { "scan_interfaces", krb5_config_string, check_boolean },
-    { "srv_lookup", krb5_config_string, check_boolean },
-    { "srv_try_txt", krb5_config_string, check_boolean },
-    { "ticket_lifetime", krb5_config_string, check_time },
-    { "time_format", krb5_config_string, NULL },
-    { "transited_realms_reject", krb5_config_string, NULL },
-    { "no-addresses", krb5_config_string, check_boolean },
-    { "v4_instance_resolve", krb5_config_string, check_boolean },
-    { "v4_name_convert", krb5_config_list, v4_name_convert_entries },
-    { "verify_ap_req_nofail", krb5_config_string, check_boolean },
-    { "max_retries", krb5_config_string, check_time },
-    { "renew_lifetime", krb5_config_string, check_time },
-    { "proxiable", krb5_config_string, check_boolean },
-    { "warn_pwexpire", krb5_config_string, check_time },
+    { "ccapi_library", krb5_config_string, NULL, 0 },
+    { "check_pac", krb5_config_string, check_boolean, 0 },
+    { "check-rd-req-server", krb5_config_string, check_boolean, 0 },
+    { "clockskew", krb5_config_string, check_time, 0 },
+    { "date_format", krb5_config_string, NULL, 0 },
+    { "default_as_etypes", krb5_config_string, NULL, 0 },
+    { "default_cc_name", krb5_config_string, NULL, 0 },
+    { "default_cc_type", krb5_config_string, NULL, 0 },
+    { "default_etypes", krb5_config_string, NULL, 0 },
+    { "default_etypes_des", krb5_config_string, NULL, 0 },
+    { "default_keytab_modify_name", krb5_config_string, NULL, 0 },
+    { "default_keytab_name", krb5_config_string, NULL, 0 },
+    { "default_keytab_modify_name", krb5_config_string, NULL, 0 },
+    { "default_realm", krb5_config_string, NULL, 0 },
+    { "default_tgs_etypes", krb5_config_string, NULL, 0 },
+    { "dns_canonize_hostname", krb5_config_string, check_boolean, 0 },
+    { "dns_proxy", krb5_config_string, NULL, 0 },
+    { "dns_lookup_kdc", krb5_config_string, check_boolean, 0 },
+    { "dns_lookup_realm", krb5_config_string, check_boolean, 0 },
+    { "dns_lookup_realm_labels", krb5_config_string, NULL, 0 },
+    { "egd_socket", krb5_config_string, NULL, 0 },
+    { "encrypt", krb5_config_string, check_boolean, 0 },
+    { "extra_addresses", krb5_config_string, NULL, 0 },
+    { "fcache_version", krb5_config_string, check_numeric, 0 },
+    { "fcache_strict_checking", krb5_config_string, check_boolean, 0 },
+    { "fcc-mit-ticketflags", krb5_config_string, check_boolean, 0 },
+    { "forward", krb5_config_string, check_boolean, 0 },
+    { "forwardable", krb5_config_string, check_boolean, 0 },
+    { "allow_hierarchical_capaths", krb5_config_string, check_boolean, 0 },
+    { "host_timeout", krb5_config_string, check_time, 0 },
+    { "http_proxy", krb5_config_string, check_host /* XXX */, 0 },
+    { "ignore_addresses", krb5_config_string, NULL, 0 },
+    { "k5login_authoritative", krb5_config_string, check_boolean, 0 },
+    { "k5login_directory", krb5_config_string, NULL, 0 },
+    { "kdc_timeout", krb5_config_string, check_time, 0 },
+    { "kdc_timesync", krb5_config_string, check_boolean, 0 },
+    { "kuserok", krb5_config_string, NULL, 0 },
+    { "large_message_size", krb5_config_string, check_numeric, 0 },
+    { "log_utc", krb5_config_string, check_boolean, 0 },
+    { "max_retries", krb5_config_string, check_numeric, 0 },
+    { "maximum_message_size", krb5_config_string, check_numeric, 0 },
+    { "moduli", krb5_config_string, NULL, 0 },
+    { "name_canon_rules", krb5_config_string, NULL, 0 },
+    { "no-addresses", krb5_config_string, check_boolean, 0 },
+    { "pkinit_dh_min_bits", krb5_config_string, NULL, 0 },
+    { "proxiable", krb5_config_string, check_boolean, 0 },
+    { "renew_lifetime", krb5_config_string, check_time, 0 },
+    { "scan_interfaces", krb5_config_string, check_boolean, 0 },
+    { "srv_lookup", krb5_config_string, check_boolean, 0 },
+    { "srv_try_txt", krb5_config_string, check_boolean, 0 },
+    { "ticket_lifetime", krb5_config_string, check_time, 0 },
+    { "time_format", krb5_config_string, NULL, 0 },
+    { "transited_realms_reject", krb5_config_string, NULL, 0 },
+    { "use_fallback", krb5_config_string, check_boolean, 0 },
+    { "v4_instance_resolve", krb5_config_string, check_boolean, 0 },
+    { "v4_name_convert", krb5_config_list, v4_name_convert_entries, 0 },
+    { "verify_ap_req_nofail", krb5_config_string, check_boolean, 0 },
+    { "warn_pwexpire", krb5_config_string, check_time, 0 },
+
     /* MIT stuff */
-    { "permitted_enctypes", krb5_config_string, mit_entry },
-    { "default_tgs_enctypes", krb5_config_string, mit_entry },
-    { "default_tkt_enctypes", krb5_config_string, mit_entry },
-    { NULL }
+    { "permitted_enctypes", krb5_config_string, mit_entry, 0 },
+    { "default_tgs_enctypes", krb5_config_string, mit_entry, 0 },
+    { "default_tkt_enctypes", krb5_config_string, mit_entry, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry appdefaults_entries[] = {
-    { "afslog", krb5_config_string, check_boolean },
-    { "afs-use-524", krb5_config_string, check_524 },
-    { "encrypt", krb5_config_string, check_boolean },
-    { "forward", krb5_config_string, check_boolean },
-    { "forwardable", krb5_config_string, check_boolean },
-    { "proxiable", krb5_config_string, check_boolean },
-    { "ticket_lifetime", krb5_config_string, check_time },
-    { "renew_lifetime", krb5_config_string, check_time },
-    { "no-addresses", krb5_config_string, check_boolean },
-    { "krb4_get_tickets", krb5_config_string, check_boolean },
-    { "pkinit_anchors", krb5_config_string, NULL },
-    { "pkinit_win2k", krb5_config_string, NULL },
-    { "pkinit_win2k_require_binding", krb5_config_string, NULL },
-    { "pkinit_require_eku", krb5_config_string, NULL },
-    { "pkinit_require_krbtgt_otherName", krb5_config_string, NULL },
-    { "pkinit_require_hostname_match", krb5_config_string, NULL },
+    { "afslog", krb5_config_string, check_boolean, 0 },
+    { "afs-use-524", krb5_config_string, check_524, 0 },
 #if 0
-    { "anonymous", krb5_config_string, check_boolean },
+    { "anonymous", krb5_config_string, check_boolean, 0 },
 #endif
-    { "", krb5_config_list, appdefaults_entries },
-    { NULL }
+    { "encrypt", krb5_config_string, check_boolean, 0 },
+    { "forward", krb5_config_string, check_boolean, 0 },
+    { "forwardable", krb5_config_string, check_boolean, 0 },
+    { "krb4_get_tickets", krb5_config_string, check_boolean, 0 },
+    { "proxiable", krb5_config_string, check_boolean, 0 },
+    { "renew_lifetime", krb5_config_string, check_time, 0 },
+    { "no-addresses", krb5_config_string, check_boolean, 0 },
+    { "pkinit_anchors", krb5_config_string, NULL, 0 },
+    { "pkinit_pool", krb5_config_string, NULL, 0 },
+    { "pkinit_require_eku", krb5_config_string, NULL, 0 },
+    { "pkinit_require_hostname_match", krb5_config_string, NULL, 0 },
+    { "pkinit_require_krbtgt_otherName", krb5_config_string, NULL, 0 },
+    { "pkinit_revoke", krb5_config_string, NULL, 0 },
+    { "pkinit_trustedCertifiers", krb5_config_string, check_boolean, 0 },
+    { "pkinit_win2k", krb5_config_string, NULL, 0 },
+    { "pkinit_win2k_require_binding", krb5_config_string, NULL, 0 },
+    { "ticket_lifetime", krb5_config_string, check_time, 0 },
+    { "", krb5_config_list, appdefaults_entries, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry realms_entries[] = {
-    { "forwardable", krb5_config_string, check_boolean },
-    { "proxiable", krb5_config_string, check_boolean },
-    { "ticket_lifetime", krb5_config_string, check_time },
-    { "renew_lifetime", krb5_config_string, check_time },
-    { "warn_pwexpire", krb5_config_string, check_time },
-    { "kdc", krb5_config_string, check_host },
-    { "admin_server", krb5_config_string, check_host },
-    { "kpasswd_server", krb5_config_string, check_host },
-    { "krb524_server", krb5_config_string, check_host },
-    { "v4_name_convert", krb5_config_list, v4_name_convert_entries },
-    { "v4_instance_convert", krb5_config_list, all_strings },
-    { "v4_domains", krb5_config_string, NULL },
-    { "default_domain", krb5_config_string, NULL },
-    { "win2k_pkinit", krb5_config_string, NULL },
+    { "admin_server", krb5_config_string, check_host, 0 },
+    { "auth_to_local", krb5_config_string, NULL, 0 },
+    { "auth_to_local_names", krb5_config_string, NULL, 0 },
+    { "default_domain", krb5_config_string, NULL, 0 },
+    { "forwardable", krb5_config_string, check_boolean, 0 },
+    { "allow_hierarchical_capaths", krb5_config_string, check_boolean, 0 },
+    { "kdc", krb5_config_string, check_host, 0 },
+    { "kpasswd_server", krb5_config_string, check_host, 0 },
+    { "krb524_server", krb5_config_string, check_host, 0 },
+    { "kx509_ca", krb5_config_string, NULL, 0 },
+    { "kx509_include_pkinit_san", krb5_config_string, check_boolean, 0 },
+    { "name_canon_rules", krb5_config_string, NULL, 0 },
+    { "no-addresses", krb5_config_string, check_boolean, 0 },
+    { "pkinit_anchors", krb5_config_string, NULL, 0 },
+    { "pkinit_require_eku", krb5_config_string, NULL, 0 },
+    { "pkinit_require_hostname_match", krb5_config_string, NULL, 0 },
+    { "pkinit_require_krbtgt_otherName", krb5_config_string, NULL, 0 },
+    { "pkinit_trustedCertifiers", krb5_config_string, check_boolean, 0 },
+    { "pkinit_win2k", krb5_config_string, NULL, 0 },
+    { "pkinit_win2k_require_binding", krb5_config_string, NULL, 0 },
+    { "proxiable", krb5_config_string, check_boolean, 0 },
+    { "renew_lifetime", krb5_config_string, check_time, 0 },
+    { "require_initial_kca_tickets", krb5_config_string, check_boolean, 0 },
+    { "ticket_lifetime", krb5_config_string, check_time, 0 },
+    { "v4_domains", krb5_config_string, NULL, 0 },
+    { "v4_instance_convert", krb5_config_list, all_strings, 0 },
+    { "v4_name_convert", krb5_config_list, v4_name_convert_entries, 0 },
+    { "warn_pwexpire", krb5_config_string, check_time, 0 },
+    { "win2k_pkinit", krb5_config_string, NULL, 0 },
+
     /* MIT stuff */
-    { "admin_keytab", krb5_config_string, mit_entry },
-    { "acl_file", krb5_config_string, mit_entry },
-    { "dict_file", krb5_config_string, mit_entry },
-    { "kadmind_port", krb5_config_string, mit_entry },
-    { "kpasswd_port", krb5_config_string, mit_entry },
-    { "master_key_name", krb5_config_string, mit_entry },
-    { "master_key_type", krb5_config_string, mit_entry },
-    { "key_stash_file", krb5_config_string, mit_entry },
-    { "max_life", krb5_config_string, mit_entry },
-    { "max_renewable_life", krb5_config_string, mit_entry },
-    { "default_principal_expiration", krb5_config_string, mit_entry },
-    { "default_principal_flags", krb5_config_string, mit_entry },
-    { "supported_enctypes", krb5_config_string, mit_entry },
-    { "database_name", krb5_config_string, mit_entry },
-    { NULL }
+    { "admin_keytab", krb5_config_string, mit_entry, 0 },
+    { "acl_file", krb5_config_string, mit_entry, 0 },
+    { "database_name", krb5_config_string, mit_entry, 0 },
+    { "default_principal_expiration", krb5_config_string, mit_entry, 0 },
+    { "default_principal_flags", krb5_config_string, mit_entry, 0 },
+    { "dict_file", krb5_config_string, mit_entry, 0 },
+    { "kadmind_port", krb5_config_string, mit_entry, 0 },
+    { "kpasswd_port", krb5_config_string, mit_entry, 0 },
+    { "master_kdc", krb5_config_string, mit_entry, 0 },
+    { "master_key_name", krb5_config_string, mit_entry, 0 },
+    { "master_key_type", krb5_config_string, mit_entry, 0 },
+    { "key_stash_file", krb5_config_string, mit_entry, 0 },
+    { "max_life", krb5_config_string, mit_entry, 0 },
+    { "max_renewable_life", krb5_config_string, mit_entry, 0 },
+    { "supported_enctypes", krb5_config_string, mit_entry, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry realms_foobar[] = {
-    { "", krb5_config_list, realms_entries },
-    { NULL }
+    { "", krb5_config_list, realms_entries, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 
 struct entry kdc_database_entries[] = {
-    { "realm", krb5_config_string, NULL },
-    { "dbname", krb5_config_string, NULL },
-    { "mkey_file", krb5_config_string, NULL },
-    { "acl_file", krb5_config_string, NULL },
-    { "log_file", krb5_config_string, NULL },
-    { NULL }
+    { "acl_file", krb5_config_string, NULL, 0 },
+    { "dbname", krb5_config_string, NULL, 0 },
+    { "log_file", krb5_config_string, NULL, 0 },
+    { "mkey_file", krb5_config_string, NULL, 0 },
+    { "realm", krb5_config_string, NULL, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry kdc_entries[] = {
-    { "database", krb5_config_list, kdc_database_entries },
-    { "key-file", krb5_config_string, NULL },
-    { "logging", krb5_config_string, check_log },
-    { "max-request", krb5_config_string, check_bytes },
-    { "require-preauth", krb5_config_string, check_boolean },
-    { "ports", krb5_config_string, NULL },
-    { "addresses", krb5_config_string, NULL },
-    { "enable-kerberos4", krb5_config_string, check_boolean },
-    { "enable-524", krb5_config_string, check_boolean },
-    { "enable-http", krb5_config_string, check_boolean },
-    { "check-ticket-addresses", krb5_config_string, check_boolean },
-    { "allow-null-ticket-addresses", krb5_config_string, check_boolean },
-    { "allow-anonymous", krb5_config_string, check_boolean },
-    { "v4_realm", krb5_config_string, NULL },
+    { "addresses", krb5_config_string, NULL, 0 },
+    { "allow-anonymous", krb5_config_string, check_boolean, 0 },
+    { "allow-null-ticket-addresses", krb5_config_string, check_boolean, 0 },
+    { "check-ticket-addresses", krb5_config_string, check_boolean, 0 },
+    { "database", krb5_config_list, kdc_database_entries, 0 },
+    { "detach", krb5_config_string, check_boolean, 0 },
+    { "digests_allowed", krb5_config_string, NULL, 0 },
+    { "disable-des", krb5_config_string, check_boolean, 0 },
+    { "enable-524", krb5_config_string, check_boolean, 0 },
+    { "enable-digest", krb5_config_string, check_boolean, 0 },
     { "enable-kaserver", krb5_config_string, check_boolean, 1 },
-    { "encode_as_rep_as_tgs_rep", krb5_config_string, check_boolean },
-    { "kdc_warn_pwexpire", krb5_config_string, check_time },
-    { "use_2b", krb5_config_list, NULL },
-    { "enable-pkinit", krb5_config_string, check_boolean },
-    { "pkinit_identity", krb5_config_string, NULL },
-    { "pkinit_anchors", krb5_config_string, NULL },
-    { "pkinit_pool", krb5_config_string, NULL },
-    { "pkinit_revoke", krb5_config_string, NULL },
-    { "pkinit_kdc_ocsp", krb5_config_string, NULL },
-    { "pkinit_principal_in_certificate", krb5_config_string, NULL },
-    { "pkinit_dh_min_bits", krb5_config_string, NULL },
-    { "pkinit_allow_proxy_certificate", krb5_config_string, NULL },
-    { "hdb-ldap-create-base", krb5_config_string, NULL },
-    { "v4-realm", krb5_config_string, NULL },
-    { NULL }
+    { "enable-kerberos4", krb5_config_string, check_boolean, 1 },
+    { "enable-kx509", krb5_config_string, check_boolean, 0 },
+    { "enable-http", krb5_config_string, check_boolean, 0 },
+    { "enable-pkinit", krb5_config_string, check_boolean, 0 },
+    { "encode_as_rep_as_tgs_rep", krb5_config_string, check_boolean, 0 },
+    { "enforce-transited-policy", krb5_config_string, NULL, 1 },
+    { "hdb-ldap-create-base", krb5_config_string, NULL, 0 },
+    { "iprop-acl", krb5_config_string, NULL, 0 },
+    { "iprop-stats", krb5_config_string, NULL, 0 },
+    { "kdc-request-log", krb5_config_string, NULL, 0 },
+    { "kdc_warn_pwexpire", krb5_config_string, check_time, 0 },
+    { "key-file", krb5_config_string, NULL, 0 },
+    { "kx509_ca", krb5_config_string, NULL, 0 },
+    { "kx509_include_pkinit_san", krb5_config_string, check_boolean, 0 },
+    { "kx509_template", krb5_config_string, NULL, 0 },
+    { "logging", krb5_config_string, check_log, 0 },
+    { "max-kdc-datagram-reply-length", krb5_config_string, check_bytes, 0 },
+    { "max-request", krb5_config_string, check_bytes, 0 },
+    { "pkinit_allow_proxy_certificate", krb5_config_string, check_boolean, 0 },
+    { "pkinit_anchors", krb5_config_string, NULL, 0 },
+    { "pkinit_dh_min_bits", krb5_config_string, check_numeric, 0 },
+    { "pkinit_identity", krb5_config_string, NULL, 0 },
+    { "pkinit_kdc_friendly_name", krb5_config_string, NULL, 0 },
+    { "pkinit_kdc_ocsp", krb5_config_string, NULL, 0 },
+    { "pkinit_mappings_file", krb5_config_string, NULL, 0 },
+    { "pkinit_pool", krb5_config_string, NULL, 0 },
+    { "pkinit_principal_in_certificate", krb5_config_string, check_boolean, 0 },
+    { "pkinit_revoke", krb5_config_string, NULL, 0 },
+    { "pkinit_win2k_require_binding", krb5_config_string, check_boolean, 0 },
+    { "ports", krb5_config_string, NULL, 0 },
+    { "preauth-use-strongest-session-key", krb5_config_string, check_boolean, 0 },
+    { "require_initial_kca_tickets", krb5_config_string, check_boolean, 0 },
+    { "require-preauth", krb5_config_string, check_boolean, 0 },
+    { "svc-use-strongest-session-key", krb5_config_string, check_boolean, 0 },
+    { "tgt-use-strongest-session-key", krb5_config_string, check_boolean, 0 },
+    { "transited-policy", krb5_config_string, NULL, 0 },
+    { "use_2b", krb5_config_list, NULL, 0 },
+    { "use-strongest-server-key", krb5_config_string, check_boolean, 0 },
+    { "v4_realm", krb5_config_string, NULL, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry kadmin_entries[] = {
-    { "password_lifetime", krb5_config_string, check_time },
-    { "default_keys", krb5_config_string, NULL },
-    { "use_v4_salt", krb5_config_string, NULL },
-    { "require-preauth", krb5_config_string, check_boolean },
-    { NULL }
+    { "allow_self_change_password", krb5_config_string, check_boolean, 0 },
+    { "default_keys", krb5_config_string, NULL, 0 },
+    { "password_lifetime", krb5_config_string, check_time, 0 },
+    { "require-preauth", krb5_config_string, check_boolean, 0 },
+    { "save-password", krb5_config_string, check_boolean, 0 },
+    { "use_v4_salt", krb5_config_string, NULL, 0 },
+    { NULL, 0, NULL, 0 }
 };
 struct entry log_strings[] = {
-    { "", krb5_config_string, check_log },
-    { NULL }
+    { "", krb5_config_string, check_log, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 
 /* MIT stuff */
 struct entry kdcdefaults_entries[] = {
-    { "kdc_ports", krb5_config_string, mit_entry },
-    { "v4_mode", krb5_config_string, mit_entry },
-    { NULL }
+    { "kdc_ports", krb5_config_string, mit_entry, 0 },
+    { "v4_mode", krb5_config_string, mit_entry, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry capaths_entries[] = {
-    { "", krb5_config_list, all_strings },
-    { NULL }
+    { "", krb5_config_list, all_strings, 0 },
+    { NULL, 0, NULL, 0 }
+};
+
+struct entry kcm_entries[] = {
+    { "detach", krb5_config_string, check_boolean, 0 },
+    { "disallow-getting-krbtgt", krb5_config_string, check_boolean, 0 },
+    { "logging", krb5_config_string, NULL, 0 },
+    { "max-request", krb5_config_string, NULL, 0 },
+    { "system_ccache", krb5_config_string, NULL, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry password_quality_entries[] = {
-    { "policies", krb5_config_string, NULL },
-    { "external_program", krb5_config_string, NULL },
-    { "min_classes", krb5_config_string, check_numeric },
-    { "min_length", krb5_config_string, check_numeric },
-    { "", krb5_config_list, all_strings },
-    { NULL }
+    { "check_function", krb5_config_string, NULL, 0 },
+    { "check_library", krb5_config_string, NULL, 0 },
+    { "external_program", krb5_config_string, NULL, 0 },
+    { "min_classes", krb5_config_string, check_numeric, 0 },
+    { "min_length", krb5_config_string, check_numeric, 0 },
+    { "policies", krb5_config_string, NULL, 0 },
+    { "policy_libraries", krb5_config_string, NULL, 0 },
+    { "", krb5_config_list, all_strings, 0 },
+    { NULL, 0, NULL, 0 }
 };
 
 struct entry toplevel_sections[] = {
-    { "libdefaults" , krb5_config_list, libdefaults_entries },
-    { "realms", krb5_config_list, realms_foobar },
-    { "domain_realm", krb5_config_list, all_strings },
-    { "logging", krb5_config_list, log_strings },
-    { "kdc", krb5_config_list, kdc_entries },
-    { "kadmin", krb5_config_list, kadmin_entries },
-    { "appdefaults", krb5_config_list, appdefaults_entries },
-    { "gssapi", krb5_config_list, NULL },
-    { "capaths", krb5_config_list, capaths_entries },
-    { "password_quality", krb5_config_list, password_quality_entries },
+    { "appdefaults", krb5_config_list, appdefaults_entries, 0 },
+    { "capaths", krb5_config_list, capaths_entries, 0 },
+    { "domain_realm", krb5_config_list, all_strings, 0 },
+    { "gssapi", krb5_config_list, NULL, 0 },
+    { "kadmin", krb5_config_list, kadmin_entries, 0 },
+    { "kcm", krb5_config_list, kcm_entries, 0 },
+    { "kdc", krb5_config_list, kdc_entries, 0 },
+    { "libdefaults" , krb5_config_list, libdefaults_entries, 0 },
+    { "logging", krb5_config_list, log_strings, 0 },
+    { "password_quality", krb5_config_list, password_quality_entries, 0 },
+    { "realms", krb5_config_list, realms_foobar, 0 },
+
     /* MIT stuff */
-    { "kdcdefaults", krb5_config_list, kdcdefaults_entries },
-    { NULL }
+    { "kdcdefaults", krb5_config_list, kdcdefaults_entries, 0 },
+    { NULL, 0, NULL, 0 }
 };