--- a/eapol/eapol_framework/eapol_common/type/eap_type_all.cpp	Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/eap_type_all.cpp	Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 18 %
+* %version: %
 */
 
 // This is enumeration of EAPOL source code.
@@ -88,8 +88,11 @@
 	abs_eap_base_type_c * const partner,
 	const eap_type_value_e eap_type,
 	const bool is_client_when_true,
-	const eap_am_network_id_c * const receive_network_id,
-	abs_eap_configuration_if_c * const configuration_if)
+	const eap_am_network_id_c * const receive_network_id
+#if defined(USE_EAP_SIMPLE_CONFIG)
+	, abs_eap_configuration_if_c * const configuration_if
+#endif // #if defined(USE_EAP_SIMPLE_CONFIG)
+	)
 {
 	EAP_TRACE_BEGIN(tools, TRACE_FLAGS_DEFAULT);
 	eap_base_type_c *type = 0;
@@ -531,7 +534,6 @@
 	}
 	else
 #endif
-#if defined(USE_EAP_EXPANDED_TYPES)
 #if defined(USE_EAP_SIMPLE_CONFIG)
 	if (eap_type == eap_expanded_type_simple_config.get_type())
 	{
@@ -585,7 +587,6 @@
 	}
 	else
 #endif //#if defined(USE_EAP_SIMPLE_CONFIG)
-#endif //#if defined(USE_EAP_EXPANDED_TYPES)
 #if defined(USE_FAST_EAP_TYPE)
 	if (eap_type == eap_type_fast)
 	{
@@ -683,8 +684,10 @@
 		EAP_TRACE_ERROR(
 			tools,
 			TRACE_FLAGS_DEFAULT,
-			(EAPL("ERROR: new_eap_type(): EAP-type=0x%08x not supported in this module.\n"),
-			convert_eap_type_to_u32_t(eap_type)));
+			(EAPL("ERROR: new_eap_type(): EAP-type=0xfe%06x%08x=%s not supported in this module.\n"),
+			eap_type.get_vendor_id(),
+			eap_type.get_vendor_type(),
+			eap_header_string_c::get_eap_type_string(eap_type)));
 	}
 	EAP_TRACE_END(tools, TRACE_FLAGS_DEFAULT);
 	return type;