diff -r 9f4e37332ce5 -r 473321461bba vpnengine/ikepolparser/src/ikepolparser.cpp --- a/vpnengine/ikepolparser/src/ikepolparser.cpp Thu Aug 19 10:54:34 2010 +0300 +++ b/vpnengine/ikepolparser/src/ikepolparser.cpp Tue Aug 31 16:14:16 2010 +0300 @@ -169,8 +169,6 @@ CleanupStack::Pop(ca_copy); } } - - iUseCache = aData->iUseCache; } void CIkeData::Empty() @@ -453,8 +451,11 @@ else if (token.CompareF(_L("IKE_VERSION:"))==0) //CompareF ignores case { sub_num = NextToken(); - sub_num.Val(aConf->iIkeVersion, EDecimal); - if ( aConf->iIkeVersion != 2 ) + if ( sub_num.Val(aConf->iIkeVersion, EDecimal) != KErrNone ) + { + err = KSecParserErrUnknown; + } + else if ( aConf->iIkeVersion != 2 ) aConf->iIkeVersion = 1; // IKE version 1 is currently the default } else if (token.CompareF(_L("SEND_NOTIFICATION:"))==0) //CompareF ignores case @@ -727,13 +728,6 @@ //PeerCerts List else if (token.CompareF(_L("PEER_CERTS:"))==0) //CompareF ignores case err = ParsePeerCerts(aConf); - else if (token.CompareF(_L("USE_CACHE:"))==0) //CompareF ignores case - { - aConf->iUseCache = EFalse; - token.Set(NextToken()); - if (token.CompareF(_L("True"))==0) - aConf->iUseCache = ETrue; - } } if ( err == KErrNone ) errCA=CheckPolicy(aConf); @@ -1114,16 +1108,6 @@ err = BufferAppend(aPolBfr, line); if (err != KErrNone) return err; - - line.Copy(_L8("USE_CACHE: ")); - if (aConf->iUseCache) - line.Append(_L("TRUE\n")); - else - line.Append(_L("FALSE\n")); - err = BufferAppend(aPolBfr, line); - if (err != KErrNone) - return err; - if ( aConf->iCRACKLAMUserName ) { line.Copy(_L8("CRACK_LAM_USERNAME: "));