diff -r bad0cc58d154 -r c74b3d9f6b9e eapol/eapol_framework/eapol_symbian/group/bld.inf
--- a/eapol/eapol_framework/eapol_symbian/group/bld.inf	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/bld.inf	Wed Sep 01 12:23:57 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 37 %
+* %version: 3 %
 */
 
 #include <platform_paths.hrh>
@@ -26,57 +26,41 @@
 
 PRJ_EXPORTS
 
-
+// Exporting IBY file (only for 5.0).
 ../rom/eapol.iby	CORE_MW_LAYER_IBY_EXPORT_PATH(eapol.iby) 
 
-// Secure policy file for saving all EAPOL and EAP databases in DBMS.
+// Secure policy file for saving all EAPOL AND EAP databases in DBMS.
 ../am/include/102072e9.spd 	/epoc32/data/z/private/100012a5/policy/102072e9.spd
 ../am/include/102072e9.spd  /epoc32/release/winscw/udeb/z/private/100012a5/policy/102072e9.spd
 ../am/include/102072e9.spd  /epoc32/release/winscw/urel/z/private/100012a5/policy/102072e9.spd
 
-// Backup registration file for backing up all EAPOL databases. Exported to the private cage path of WLAN engine.
+// Backup registration file for backing up all EAPOL related databases. Exported to the private cage path for WLAN engine.
 backup_registration_eapol.xml  /epoc32/data/z/private/101F8EC5/backup_registration_eapol.xml
 backup_registration_eapol.xml  /epoc32/release/winscw/udeb/z/private/101F8EC5/backup_registration_eapol.xml
 backup_registration_eapol.xml  /epoc32/release/winscw/urel/z/private/101F8EC5/backup_registration_eapol.xml
 
-// Backup registration file for backing up all EAP server databases. Exported to the private cage path of EAP server.
-backup_registration.xml  /epoc32/data/z/private/20026FCB/backup_registration.xml
-backup_registration.xml  /epoc32/release/udeb/urel/z/private/20026FCB/backup_registration.xml
-backup_registration.xml  /epoc32/release/winscw/urel/z/private/20026FCB/backup_registration.xml
-
-// copy EAPOL configuration file to WLAN server's private cage path
+// Copies configuration file of EAPOL.
 ../am/core/symbian/file_config/eap_symbian.conf  /epoc32/data/z/private/101F8EC5/eap.conf
 ../am/core/symbian/file_config/eap_symbian.conf  /epoc32/release/winscw/udeb/z/private/101F8EC5/eap.conf
 ../am/core/symbian/file_config/eap_symbian.conf  /epoc32/release/winscw/urel/z/private/101F8EC5/eap.conf
 
-// copy EAP server configuration file to EAP server's the private cage path
-../am/core/symbian/file_config/eap_symbian.conf  /epoc32/data/z/private/20026FCB/eap.conf
-../am/core/symbian/file_config/eap_symbian.conf  /epoc32/release/winscw/udeb/z/private/20026FCB/eap.conf
-../am/core/symbian/file_config/eap_symbian.conf  /epoc32/release/winscw/urel/z/private/20026FCB/eap.conf
+#ifndef __SERIES60_HELP
+../am/type/securid/symbian/plugin/inc/eapgtc.hlp.hrh     /epoc32/include/cshelp/eapgtc.hlp.hrh
+../am/type/mschapv2/symbian/plugin/inc/eapmschap.hlp.hrh /epoc32/include/cshelp/eapmschap.hlp.hrh
+../am/type/tls_peap/symbian/plugin/inc/eappeap.hlp.hrh   /epoc32/include/cshelp/eappeap.hlp.hrh
+../am/type/gsmsim/symbian/plugin/inc/eapsim.hlp.hrh      /epoc32/include/cshelp/eapsim.hlp.hrh
+../am/type/tls_peap/symbian/plugin/inc/eaptls.hlp.hrh    /epoc32/include/cshelp/eaptls.hlp.hrh
+#endif
+
+#ifndef __SERIES60_HELP
+// EAP-LEAP is part of WPX. You need special release to compile this. However the header is needed.
+../am/type/leap/symbian/plugin/inc/eapleap.hlp.hrh /epoc32/include/cshelp/eapleap.hlp.hrh
+#endif
+
 
 PRJ_MMPFILES
 
-// Tools libraries are needed by other modules. Must be built first.
-#include "../tools/group/bld.inf"
-
-eap_notifier.mmp
-
-// eap server
-eapauthserver.mmp
-
-// eap server exe
-eapauthserverexe.mmp
-
-// eapclientif
-eapclientif.mmp
-
-// coreinterfaceimplementation
-eapcoreinterfaceimplementation.mmp
-
-// coreinterface
-eapcoreinterface.mmp
-
-// compiles EAPOL WPX stub
+// This compiles stub of EAPOL WPX, the empty functions that implement WPX.
 eapolwpxstub.mmp
 
 // This is the basic set that should always be compiled for every environment.
@@ -86,14 +70,14 @@
 eapmschapv2.mmp
 eapsecurid.mmp
 eapaka.mmp
-eapprotectedsetup.mmp
-eapgeneric.mmp
-eapgeneralsettings.mmp
 
-// Interface for providing EAP authentication services to VPN
+// API for VPN.
 eapvpnif.mmp
 
-// Iterface for providing authentication services to WLAN
+eapprotectedsetup.mmp
+
+// API for WLAN-engine.
 wlaneapolif.mmp
 
+
 // End of file.