diff -r bad0cc58d154 -r c74b3d9f6b9e eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/inc/EapSimDbDefaults.h
--- a/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/inc/EapSimDbDefaults.h	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/inc/EapSimDbDefaults.h	Wed Sep 01 12:23:57 2010 +0100
@@ -16,24 +16,49 @@
 */
 
 /*
-* %version: %
+* %version: 18 %
 */
 
 #if !defined(_EAPSIMDBDEFAULTS_H_)
 #define _EAPSIMDBDEFAULTS_H_
 
-#include "EapPluginDbDefaults.h"
+enum TGSMSIMUsePseudonymId 
+{
+	EGSMSIMUsePseudonymIdNo,		// False. Don't use pseudonym id.
+	EGSMSIMUsePseudonymIdYes,		// True. Use pseudonym id.
+	EGSMSIMUsePseudonymIdNotValid 	// This indicates that the value is not configured.
+};
+
+enum TGSMSIMUseManualRealm 
+{
+	EGSMSIMUseManualRealmNo,		// False. Don't use Manual Realm.
+	EGSMSIMUseManualRealmYes,		// True. Use Manual Realm.
+};
+
+enum TGSMSIMUseManualUsername 
+{
+	EGSMSIMUseManualUsernameNo,		// False. Don't use Manual Username.
+	EGSMSIMUseManualUsernameYes,		// True. Use Manual Username.
+};
 
 // LOCAL CONSTANTS
-const TInt default_EAP_GSMSIM_use_manual_realm = EEapDbFalse;
+const TInt default_EAP_GSMSIM_use_manual_realm = EGSMSIMUseManualRealmNo;
+_LIT(default_EAP_GSMSIM_manual_realm, "");
 
-const TInt default_EAP_GSMSIM_use_manual_username = EEapDbFalse;
+const TInt default_EAP_GSMSIM_use_manual_username = EGSMSIMUseManualUsernameNo;
+_LIT(default_EAP_GSMSIM_manual_username, "");
 
-const TInt default_EAP_GSMSIM_use_pseudonym_identity = EEapDbTrue; // Default is, use pseudonym identity.
+const TInt default_EAP_GSMSIM_use_pseudonym_identity = EGSMSIMUsePseudonymIdYes; // Default is, use pseudonym identity.
+
+const TInt64 default_MaxSessionTime = 0; // 0 means read from configuration file.
+const TInt64 default_FullAuthTime = 0;
 
 const TUint KMaxPseudonymIdLengthInDB = 1020; // This is the max possible length of an EAP packet.
 const TUint KMaxReauthIdLengthInDB = 1020; //  Hope pseudonym id or reauth id can't be more than that.
 
+const TUint KMaxManualUsernameLengthInDB = 255;
+const TUint KMaxManualRealmLengthInDB = 255;
+
 const TUint KMaxIMSILengthInDB = 15;
 
 const TUint KMaxXKeyLengthInDB = 20;