# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272379311 -10800
# Node ID 5db1ac3b4374be9f2827198d39119e63df677310
# Parent  9fc0ed567871086421755a71eec183fb52008b9b
Revision: 201015
Kit: 201017

diff -r 9fc0ed567871 -r 5db1ac3b4374 group/bld.inf
--- a/group/bld.inf	Wed Apr 14 17:02:54 2010 +0300
+++ b/group/bld.inf	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,6 @@
 
 PRJ_EXPORTS
 
-#ifdef FF_VPN_CLIENT
 ../vpnengine/dmadengine/rom/dmadengine.iby                             CORE_MW_LAYER_IBY_EXPORT_PATH(dmadengine.iby)
 ../vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(dmadipsecvpn.iby)
 ../vpnengine/dmadpki/rom/dmadpki.iby                                   CORE_MW_LAYER_IBY_EXPORT_PATH(dmadpki.iby)
@@ -47,6 +46,7 @@
 ../vpnengine/vpnmanager/rom/vpnmanager.iby                             CORE_MW_LAYER_IBY_EXPORT_PATH(vpnmanager.iby)
 ../vpnengine/vpnins/rom/vpnins.iby                                     CORE_MW_LAYER_IBY_EXPORT_PATH(vpnins.iby)
 ../vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(vpnipsecpolparser.iby)
+../vpnengine/vpntcwrapper/rom/vpntcwrapper.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(vpntcwrapper.iby)
 
 ../vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby                       CORE_MW_LAYER_IBY_EXPORT_PATH(vpnecomnotifier.iby)
 ../vpnui/vpndialogmanager/rom/vpndialogmanager.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(vpndialogmanager.iby)
@@ -56,13 +56,8 @@
 ../vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby              LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(vpnecomnotifierResources.iby)
 ../vpnui/vpnmanagementui/rom/vpnmanagementuiResources.iby              LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(vpnmanagementuiResources.iby)
 
-#ifndef FF_GENERIC_ACCESS_NETWORK // UMA not supported
 ../vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(vpnpolicyrecognizer.iby)
 ../rom/ipsecvpn.iby                                                    CORE_MW_LAYER_IBY_EXPORT_PATH(ipsecvpn.iby)
-#endif
-
-
-#endif // FF_VPN_CLIENT
 
 // vpnapi.dll should be in rom always
 ../vpnapiimpl/rom/vpnapi.iby                                           CORE_MW_LAYER_IBY_EXPORT_PATH(vpnapi.iby)
diff -r 9fc0ed567871 -r 5db1ac3b4374 rom/ipsecvpn.iby
--- a/rom/ipsecvpn.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/rom/ipsecvpn.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,15 @@
 #ifndef __IPSECVPN_IBY__
 #define __IPSECVPN_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifdef FF_VPN_CLIENT
 
-REM Feature VPNCLIENT STUB SISSES not included in this rom
-
-#else
+#ifndef FF_GENERIC_ACCESS_NETWORK // UMA not supported
 
 data=ZSYSTEM\install\ipsecvpn.sis               system\install\ipsecvpn.sis
 data=ZSYSTEM\install\ipsecvpn_vpnpolins.sis     system\install\ipsecvpn_vpnpolins.sis
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif
+
+#endif // FF_VPN_CLIENT
 
 #endif // __IPSECVPN_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/dmadengine/rom/dmadengine.iby
--- a/vpnengine/dmadengine/rom/dmadengine.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/dmadengine/rom/dmadengine.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,14 +19,10 @@
 #ifndef __DMADENGINE_IBY__
 #define __DMADENGINE_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM dmadentine not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\dmadengine.dll		SHARED_LIB_DIR\dmadengine.dll
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __DMADENGINE_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby
--- a/vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/dmadipsecvpn/rom/dmadipsecvpn.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __DMADIPSECVPN_IBY__
 #define __DMADIPSECVPN_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM dmadipsecvpn not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 ECOM_PLUGIN(dmadipsecvpn.dll, dmadipsecvpn.rsc)
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __DMADIPSECVPN_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/dmadpki/rom/dmadpki.iby
--- a/vpnengine/dmadpki/rom/dmadpki.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/dmadpki/rom/dmadpki.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __DMADPKI_IBY__
 #define __DMADPKI_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM dmadpki not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 ECOM_PLUGIN(dmadpki.dll, dmadpki.rsc)
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __DMADPKI_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/eventmediator/rom/eventmediator.iby
--- a/vpnengine/eventmediator/rom/eventmediator.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/eventmediator/rom/eventmediator.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,10 @@
 #ifndef __EVENTMEDIATOR_IBY__
 #define __EVENTMEDIATOR_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTMEDIATOR not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\eventmed.exe         PROGRAMS_DIR\eventmed.exe
-// data=EPOCROOT##epoc32\winscw\c\private\101FD288\backup_registration.xml     Private\101FD288\backup_registration.xml
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __EVENTMEDIATOR_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/eventmediatorapi/rom/eventmediatorapi.iby
--- a/vpnengine/eventmediatorapi/rom/eventmediatorapi.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/eventmediatorapi/rom/eventmediatorapi.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __EVENTMEDIATORAPI_IBY__
 #define __EVENTMEDIATORAPI_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTMEDIATORAPI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\eventmedapi.dll         SHARED_LIB_DIR\eventmedapi.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __EVENTMEDIATORAPI_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/eventviewer/rom/eventviewer.iby
--- a/vpnengine/eventviewer/rom/eventviewer.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/eventviewer/rom/eventviewer.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
 #ifndef __EVENTVIEWER_IBY__
 #define __EVENTVIEWER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTVIEWER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\eventviewer.dll              SHARED_LIB_DIR\eventviewer.dll
 data=DATAZ_\RESOURCE_FILES_DIR\vpnlogmessages.rsc   RESOURCE_FILES_DIR\vpnlogmessages.rsc
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __EVENTVIEWER_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/ikecert/rom/ikecert.iby
--- a/vpnengine/ikecert/rom/ikecert.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/ikecert/rom/ikecert.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __IKECERT_IBY__
 #define __IKECERT_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKECERT not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\ikecert.dll        SHARED_LIB_DIR\ikecert.dll
 
-#endif
+#endif // FF_VPN_CLIENT
 
 #endif // __IKECERT_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/ikepolparser/rom/ikepolparser.iby
--- a/vpnengine/ikepolparser/rom/ikepolparser.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/ikepolparser/rom/ikepolparser.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,14 +21,10 @@
 #ifndef __IKEPOLPARSER_IBY__
 #define __IKEPOLPARSER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEPOLPARSER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\ikepolparser.dll         SHARED_LIB_DIR\ikepolparser.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __IKEPOLPARSER_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/ikesocket/rom/ikesocket.iby
--- a/vpnengine/ikesocket/rom/ikesocket.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/ikesocket/rom/ikesocket.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,13 +20,9 @@
 #ifndef __IKESOCKET_IBY__
 #define __IKESOCKET_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKESOCKET not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\ikesocket.dll         SHARED_LIB_DIR\ikesocket.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 #endif     
\ No newline at end of file
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/ikeutils/rom/ikeutils.iby
--- a/vpnengine/ikeutils/rom/ikeutils.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/ikeutils/rom/ikeutils.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
 #ifndef __IKEUTILS_IBY__
 #define __IKEUTILS_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEUTILS not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\ikeutils.dll         SHARED_LIB_DIR\ikeutils.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __IKEUTILS_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/ikev1lib/rom/ikev1lib.iby
--- a/vpnengine/ikev1lib/rom/ikev1lib.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/ikev1lib/rom/ikev1lib.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
 #ifndef __IKEV1LIB_IBY__
 #define __IKEV1LIB_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEV1LIB not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\ikev1lib.dll           SHARED_LIB_DIR\ikev1lib.dll
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __IKEV1LIB_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/ikev2lib/rom/ikev2lib.iby
--- a/vpnengine/ikev2lib/rom/ikev2lib.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/ikev2lib/rom/ikev2lib.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
 #ifndef __IKEV2LIB_IBY__
 #define __IKEV2LIB_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature IKEV2LIB not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\ikev2lib.dll           SHARED_LIB_DIR\ikev2lib.dll
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __IKEV2LIB_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/kmdapi/rom/kmdapi.iby
--- a/vpnengine/kmdapi/rom/kmdapi.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/kmdapi/rom/kmdapi.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
 #ifndef __KMDAPI_IBY__
 #define __KMDAPI_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature KMDAPI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\kmdapi.dll             SHARED_LIB_DIR\kmdapi.dll
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __KMDSERVER_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/kmdserver/rom/kmdserver.iby
--- a/vpnengine/kmdserver/rom/kmdserver.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/kmdserver/rom/kmdserver.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,15 +21,11 @@
 #ifndef __KMDSERVER_IBY__
 #define __KMDSERVER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature KMDSERVER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\kmdserver.exe          PROGRAMS_DIR\kmdserver.exe
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __KMDSERVER_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/pkiservice/rom/pkiservice.iby
--- a/vpnengine/pkiservice/rom/pkiservice.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/pkiservice/rom/pkiservice.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __PKISERVICE_IBY__
 #define __PKISERVICE_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature PKISERVICE not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\pkiservice.exe         PROGRAMS_DIR\pkiservice.exe 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __PKISERVICE_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/pkiserviceapi/rom/pkiserviceapi.iby
--- a/vpnengine/pkiserviceapi/rom/pkiserviceapi.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/pkiserviceapi/rom/pkiserviceapi.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __PKISERVICEAPI_IBY__
 #define __PKISERVICEAPI_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature PKISERVICEAPI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\pkiserviceapi.dll         SHARED_LIB_DIR\pkiserviceapi.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __PKISERVICEAPI_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/sit/rom/eventmedsit.iby
--- a/vpnengine/sit/rom/eventmedsit.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/sit/rom/eventmedsit.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __EVENTMEDSIT_IBY__
 #define __EVENTMEDSIT_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature EVENTMEDSIT not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\eventmedsit.dll         SHARED_LIB_DIR\eventmedsit.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __EVENTMEDSIT_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/utlbase64/rom/utlbase64.iby
--- a/vpnengine/utlbase64/rom/utlbase64.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/utlbase64/rom/utlbase64.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __UTLBASE64_IBY__
 #define __UTLBASE64_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLBASE64 not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\utlbase64.dll         SHARED_LIB_DIR\utlbase64.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __UTLBASE64_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/utlcrypto/rom/utlcrypto.iby
--- a/vpnengine/utlcrypto/rom/utlcrypto.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/utlcrypto/rom/utlcrypto.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __UTLCRYPTO_IBY__
 #define __UTLCRYPTO_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLCRYPTO not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\utlcrypto.dll         SHARED_LIB_DIR\utlcrypto.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __UTLCRYPTO_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/utlpkcs10/rom/utlpkcs10.iby
--- a/vpnengine/utlpkcs10/rom/utlpkcs10.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/utlpkcs10/rom/utlpkcs10.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -20,14 +20,10 @@
 #ifndef __UTLPKCS10_IBY__
 #define __UTLPKCS10_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLPKCS10 not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\utlpkcs10.dll         SHARED_LIB_DIR\utlpkcs10.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __UTLPKCS10_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/utlpkcs12/rom/utlpkcs12.iby
--- a/vpnengine/utlpkcs12/rom/utlpkcs12.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/utlpkcs12/rom/utlpkcs12.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __UTLPKCS12_IBY__
 #define __UTLPKCS12_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLPKCS12 not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\utlpkcs12.dll         SHARED_LIB_DIR\utlpkcs12.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __UTLPKCS12_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/utlxml/rom/utlxml.iby
--- a/vpnengine/utlxml/rom/utlxml.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/utlxml/rom/utlxml.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,14 +21,10 @@
 #ifndef __UTLXML_IBY__
 #define __UTLXML_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature UTLXML not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\utlxml.dll         SHARED_LIB_DIR\utlxml.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __UTLXML_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpncleaner/rom/vpncleaner.iby
--- a/vpnengine/vpncleaner/rom/vpncleaner.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpncleaner/rom/vpncleaner.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
 #ifndef __VPNCLEANER_IBY__
 #define __VPNCLEANER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNCLEANER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpncleaner.exe       PROGRAMS_DIR\vpncleaner.exe
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNCLEANER_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpnconnagt/rom/vpnconnagt.iby
--- a/vpnengine/vpnconnagt/rom/vpnconnagt.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpnconnagt/rom/vpnconnagt.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
 #ifndef __VPNCONNAGT_IBY__
 #define __VPNCONNAGT_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNCONNAGT not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpnconnagt.agt		SHARED_LIB_DIR\vpnconnagt.agt
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNCONNAGT_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpnconnagt/src/vpnconnagt.cpp
--- a/vpnengine/vpnconnagt/src/vpnconnagt.cpp	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpnconnagt/src/vpnconnagt.cpp	Tue Apr 27 17:41:51 2010 +0300
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #include <cmmanager.h>
 #include <cmconnectionmethod.h>
 #include <cmpluginvpndef.h>
@@ -315,7 +313,9 @@
         name.AppendFormat(_L("[0x%08x]"), this);
         Log::Printf(_L("%s Error %d in reading configuration\n"),name.PtrZ(), iLastErrorCode));
 
+        iNotify->AgentProgress(EVPNConnAgtDisconnected, iLastErrorCode);
         iNotify->ConnectComplete(iLastErrorCode);
+        
         aError = iLastErrorCode;
         return;
         }
@@ -769,7 +769,11 @@
     RCmConnectionMethod vpnConnection = 
         cmManager.ConnectionMethodL( iSettings.iIAPId );
     CleanupClosePushL(vpnConnection);
-    ASSERT( vpnConnection.GetBoolAttributeL(ECmVirtual) );
+
+    if ( EFalse == vpnConnection.GetBoolAttributeL(ECmVirtual) )
+        {
+        User::Leave( KErrNotSupported );
+        }
 
     // Read VPN Network Id
     const TUint32 vpnNetworkId(vpnConnection.GetIntAttributeL(ECmNetworkId));
@@ -805,7 +809,11 @@
         RCmConnectionMethod realConnection = 
             cmManager.ConnectionMethodL( realIap );
         CleanupClosePushL(realConnection);      
-        ASSERT( !realConnection.GetBoolAttributeL(ECmVirtual) );
+
+        if ( EFalse != realConnection.GetBoolAttributeL(ECmVirtual) )
+            {
+            User::Leave( KErrNotSupported );    
+            }
         
         // real iap id
         const TUint32 realIapId( realConnection.GetIntAttributeL(ECmIapId) );
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpnins/rom/vpnins.iby
--- a/vpnengine/vpnins/rom/vpnins.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpnins/rom/vpnins.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __VPNINS_IBY__
 #define __VPNINS_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNINS not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpnins.exe       PROGRAMS_DIR\vpnins.exe
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNINS_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby
--- a/vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpnipsecpolparser/rom/vpnipsecpolparser.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef __VPNIPSECPOLPARSER_IBY__
 #define __VPNIPSECPOLPARSER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNIPSECPOLPARSER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpnipsecpolparser.dll         SHARED_LIB_DIR\vpnipsecpolparser.dll 
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNIPSECPOLPARSER_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpnmanager/rom/vpnmanager.iby
--- a/vpnengine/vpnmanager/rom/vpnmanager.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpnmanager/rom/vpnmanager.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
 #ifndef __VPNMANAGER_IBY__
 #define __VPNMANAGER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNMANAGER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpnmanager.exe       PROGRAMS_DIR\vpnmanager.exe
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNMANAGER_IBY__
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpntcwrapper/rom/vpntcwrapper.iby
--- a/vpnengine/vpntcwrapper/rom/vpntcwrapper.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnengine/vpntcwrapper/rom/vpntcwrapper.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -20,11 +20,7 @@
 #ifndef __VPNTCWRAPPER_IBY__
 #define __VPNTCWRAPPER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNTCWRAPPER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 #ifdef __SAP_TERMINAL_CONTROL_FW
 #ifdef __SAP_POLICY_MANAGEMENT
@@ -34,6 +30,6 @@
 #endif //__SAP_POLICY_MANAGEMENT
 #endif //__SAP_TERMINAL_CONTROL_FW
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNTCWRAPPER_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpndialogmanager/rom/vpndialogmanager.iby
--- a/vpnui/vpndialogmanager/rom/vpndialogmanager.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpndialogmanager/rom/vpndialogmanager.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef VPNDIALOGMANAGER_IBY
 #define VPNDIALOGMANAGER_IBY
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPN DIALOG MANAGER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpndialogmanager.dll         SHARED_LIB_DIR\vpndialogmanager.dll
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // VPNDIALOGMANAGER_IBY
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby
--- a/vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpnecomnotifier/rom/vpnecomnotifier.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,37 +16,15 @@
 *
 */
 
-
-
-
-
 #ifndef VPNECOMNOTIFIER_IBY
-
 #define VPNECOMNOTIFIER_IBY
 
-
-
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-
-
-REM Feature ACUNOTIFIER not included in this rom
-
-
-
-#else
-
-
+#ifdef FF_VPN_CLIENT
 
 // ECOM_PLUGIN is defined in header.iby
-
 ECOM_PLUGIN(vpnecomnotifier.dll,vpnecomnotifier.rsc)
 
-
-
-#endif // SYMBIAN_EXCLUDE_IPSEC
-
-
+#endif // FF_VPN_CLIENT
 
 #endif // VPNECOMNOTIFIER_IBY
 
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby
--- a/vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpnecomnotifier/rom/vpnecomnotifierResources.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,10 @@
 #ifndef VPNECOMNOTIFIERRESOURCES_IBY
 #define VPNECOMNOTIFIERRESOURCES_IBY
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNECOMNOTIFIER not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 data=DATAZ_\RESOURCE_FILES_DIR\vpnecomnotifier.rsc RESOURCE_FILES_DIR\vpnecomnotifier.rsc
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // VPNECOMNOTIFIERRESOURCES_IBY
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpnmanagementui/rom/vpnmanagementui.iby
--- a/vpnui/vpnmanagementui/rom/vpnmanagementui.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpnmanagementui/rom/vpnmanagementui.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,24 +16,14 @@
 */
 
 
-
-/**
- * @file vpnmanagementui.iby
- * 
- */
-
 #ifndef __VPNMANAGEMENTUI_IBY__
 #define __VPNMANAGEMENTUI_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNMANAGEMENTUI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 data=ZRESOURCE\apps\vpnmanagementui.mif             APP_RESOURCE_DIR\vpnmanagementui.mif
 ECOM_PLUGIN(vpnmanagementui.dll,101F6D31.rsc)
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNMANAGEMENTUI_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpnmanagementui/rom/vpnmanagementuiResources.iby
--- a/vpnui/vpnmanagementui/rom/vpnmanagementuiResources.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpnmanagementui/rom/vpnmanagementuiResources.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
 #ifndef __VPNMANAGEMENTUIRESOURCES_IBY__
 #define __VPNMANAGEMENTUIRESOURCES_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNMANAGEMENTUI not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 data=DATAZ_\RESOURCE_FILES_DIR\vpnmanagementuirsc.rsc RESOURCE_FILES_DIR\vpnmanagementuirsc.rsc
 data=DATAZ_\HELP_FILE_DIR\vpn.hlp HELP_FILE_DIR\vpn.hlp
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNMANAGEMENTUIRESOURCES_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby
--- a/vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpnpolicyrecognizer/rom/vpnpolicyrecognizer.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,16 +20,15 @@
 #ifndef __VPNPOLICYRECOGNIZER_IBY__
 #define __VPNPOLICYRECOGNIZER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifdef FF_VPN_CLIENT
 
-REM Feature VPNPOLINS not included in this rom
-
-#else
-
+#ifndef FF_GENERIC_ACCESS_NETWORK // UMA not supported
 
 ECOM_PLUGIN(vpnpolicyrecognizer.dll,vpnpolicyrecognizer.rsc)
 data=ZRESOURCE\plugins\vpnpolicyrecognizer.rsc        RESOURCE_FILES_DIR\plugins\vpnpolicyrecognizer.rsc
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif
+
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNPOLICYRECOGNIZER_IBY__
diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnui/vpnpolins/rom/vpnpolins.iby
--- a/vpnui/vpnpolins/rom/vpnpolins.iby	Wed Apr 14 17:02:54 2010 +0300
+++ b/vpnui/vpnpolins/rom/vpnpolins.iby	Tue Apr 27 17:41:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 - 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,15 +20,11 @@
 #ifndef __VPNPOLINS_IBY__
 #define __VPNPOLINS_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
-
-REM Feature VPNPOLINS not included in this rom
-
-#else
+#ifdef FF_VPN_CLIENT
 
 file=ABI_DIR\BUILD_DIR\vpnpolins.exe            PROGRAMS_DIR\vpnpolins.exe
 data=ZPRIVATE\10003A3F\APPS\vpnpolins_REG.RSC   Private\10003a3f\import\apps\vpnpolins_reg.rsc
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // FF_VPN_CLIENT
 
 #endif // __VPNPOLINS_IBY__