diff -r 30e048a7b597 -r bad0cc58d154 eapol/eapol_framework/eapol_common/type/tls_peap/eap/include/eap_type_tls_peap_types.h
--- a/eapol/eapol_framework/eapol_common/type/tls_peap/eap/include/eap_type_tls_peap_types.h	Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/tls_peap/eap/include/eap_type_tls_peap_types.h	Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 62 %
+* %version: %
 */
 
 #if !defined(_EAP_TYPE_TLS_PEAP_TYPES_H_)
@@ -132,6 +132,12 @@
  */
 
 EAP_CONFIGURATION_FIELD(
+	cf_str_EAP_TLS_PEAP_use_automatic_ca_certificate,
+	"EAP_TLS_PEAP_use_automatic_ca_certificate",
+	eap_configure_type_boolean,
+	false);
+
+EAP_CONFIGURATION_FIELD(
 	cf_str_EAP_TLS_PEAP_use_manual_username,
 	"EAP_TLS_PEAP_use_manual_username",
 	eap_configure_type_boolean,
@@ -806,26 +812,6 @@
 	false);
 
 /**
- *  This boolean data configuration option activate prompt to warn for ADHP auto-provisioning when 
- *  there is no PAC that matches the A-ID sent by server. EAP-FAST specific.
- */
-EAP_CONFIGURATION_FIELD(
-	cf_str_EAP_FAST_warn_ADHP_no_matching_PAC,
-	"EAP_FAST_warn_ADHP_no_matching_PAC",
-	eap_configure_type_boolean,
-	false);
-
-/**
- *  This boolean data configuration option activate prompt to warn for ADHP (Authenticated Diffie-Hellman Protocol) 
- *  auto-provisioning when there is no PAC at all. EAP-FAST specific.
- */
-EAP_CONFIGURATION_FIELD(
-	cf_str_EAP_FAST_warn_ADHP_no_PAC,
-	"EAP_FAST_warn_ADHP_no_PAC",
-	eap_configure_type_boolean,
-	false);
-
-/**
  *  This boolean data configuration option activate prompt to warn when client encouters a server that has provisioned 
  *  the client with a PAC before but is not currently selected as the default server. EAP-FAST specific.
  */