--- a/eapol/eapol_framework/eapol_common/include/eap_tools.h	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_tools.h	Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12 %
+* %version: 8.1.2 %
 */
 
 #if !defined( _EAP_TOOLS_H_ )
@@ -347,8 +347,6 @@
 
 	#define EAP_TRACE_RETURN_STRING(object_name, string) EAP_NULL_FUNCTION
 
-	#define EAP_TRACE_RETURN_STRING_FLAGS(object_name, flags, string) EAP_NULL_FUNCTION
-
 	#define EAP_TRACE_DATA_ERROR(object_name, flags, _parameter_list_) EAP_NULL_FUNCTION
 
 	#define EAP_TRACE_DATA_DEBUG(object_name, flags, _parameter_list_) EAP_NULL_FUNCTION
@@ -417,12 +415,13 @@
 		#define EAP_TRACE_DEBUG(object_name, flags, _parameter_list_) \
 				if (object_name != 0 && ((*(object_name)).get_trace_mask() & ((flags) | eap_am_tools_c::eap_trace_mask_error))) \
 				{ \
-					if (((*(object_name)).get_trace_mask() & (flags))) \
+					if (((*(object_name)).get_trace_mask() & ((flags) & eap_am_tools_c::eap_trace_mask_error))) \
 					{ \
-						if (((*(object_name)).get_trace_mask() & ((flags) & eap_am_tools_c::eap_trace_mask_error))) \
-						{ \
-							(*(object_name)).formatted_print(EAPL("ERROR: source: %s:%d\n"), __FILE__, __LINE__); \
-						} \
+						(*(object_name)).formatted_print(EAPL("ERROR: source: %s:%d\n"), __FILE__, __LINE__); \
+						(*(object_name)).formatted_print _parameter_list_ ; \
+					} \
+					else if (((*(object_name)).get_trace_mask() & (flags))) \
+					{ \
 						(*(object_name)).formatted_print _parameter_list_ ; \
 					} \
 					else \
@@ -468,9 +467,6 @@
 		#define EAP_TRACE_RETURN_STRING(object_name, string) \
 			eap_automatic_trace_string_c __eap_trace_function_returns__(object_name, string);
 
-		#define EAP_TRACE_RETURN_STRING_FLAGS(object_name, flags, string) \
-			eap_automatic_trace_string_c __eap_trace_function_returns__(object_name, flags, string);
-
 		/**
 		 * This flag indicates that the debug traces are active.
 		 * Functions can use this flag to deduce whether debug related
@@ -488,8 +484,6 @@
 
 		#define EAP_TRACE_RETURN_STRING(object_name, string) EAP_NULL_FUNCTION
 
-		#define EAP_TRACE_RETURN_STRING_FLAGS(object_name, flags, string) EAP_NULL_FUNCTION
-
 	#endif