# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1264502637 -7200
# Node ID 958eca8527ddb19e6bedd12c7103a0c85fd08cea
# Parent  29cff3b150f3c6e1529b63ceb6d1f5f2d2492d7b
Revision: 201001
Kit: 201004

diff -r 29cff3b150f3 -r 958eca8527dd omaprovisioning/provisioning/Group/bld.inf
--- a/omaprovisioning/provisioning/Group/bld.inf	Fri Jan 22 10:33:42 2010 +0200
+++ b/omaprovisioning/provisioning/Group/bld.inf	Tue Jan 26 12:43:57 2010 +0200
@@ -89,7 +89,7 @@
 ../ProvisioningEngine/Group/ProvisioningEngine.mmp
 ../ProvisioningParser/Group/ProvisioningParser.mmp
 ../ProvisioningHandler/Group/ProvisioningHandler.mmp
-../accesspointAdapter/group/WPAPAdapter.mmp
+../accesspointadapter/group/WPAPAdapter.mmp
 ../WAPAdapter/Group/WPWAPAdapter.mmp
 ../IMAdapter/Group/IMAdapter.mmp
 ../StreamingAdapter/Group/StreamingAdapter.mmp
diff -r 29cff3b150f3 -r 958eca8527dd remotemgmt_plat/policy_management_certificate_api/tsrc/data/50_TARM_Build.doc
Binary file remotemgmt_plat/policy_management_certificate_api/tsrc/data/50_TARM_Build.doc has changed
diff -r 29cff3b150f3 -r 958eca8527dd remotemgmt_plat/policy_management_request_api/tsrc/data/50_TARM_Build.doc
Binary file remotemgmt_plat/policy_management_request_api/tsrc/data/50_TARM_Build.doc has changed
diff -r 29cff3b150f3 -r 958eca8527dd remotemgmt_plat/scp_server_api/tsrc/data/50_TARM_Build.doc
Binary file remotemgmt_plat/scp_server_api/tsrc/data/50_TARM_Build.doc has changed
diff -r 29cff3b150f3 -r 958eca8527dd remotemgmt_plat/setting_enforcement_info_api/tsrc/data/50_TARM_Build.doc
Binary file remotemgmt_plat/setting_enforcement_info_api/tsrc/data/50_TARM_Build.doc has changed
diff -r 29cff3b150f3 -r 958eca8527dd remotemgmt_plat/terminal_security_device_lock_api/tsrc/data/50_TARM_Build.doc
Binary file remotemgmt_plat/terminal_security_device_lock_api/tsrc/data/50_TARM_Build.doc has changed
diff -r 29cff3b150f3 -r 958eca8527dd terminalsecurity/SCP/SCPServer/inc/SCPServer.h
--- a/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Fri Jan 22 10:33:42 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Tue Jan 26 12:43:57 2010 +0200
@@ -92,6 +92,8 @@
 _LIT8( KCodePolicyTypeId, "http://www.w3.org/2001/XMLSchema#string" );
 
 // Allowed SIDs for the functions
+const TUint32 KSCPServerSIDTelephone( 0x100058B3 ); // Terminal Control Server
+const TUint32 KSCPServerSIDLog( 0x101f4cd5 ); // Terminal Control Server
 const TUint32 KSCPServerSIDTerminalControl( 0x10207825 ); // Terminal Control Server
 const TUint32 KSCPServerSIDGeneralSettings( 0x100058EC ); // General Settings
 //const TUint32 KSCPServerSIDSecurityObserver( 0x10000938 ); // Security Observer
diff -r 29cff3b150f3 -r 958eca8527dd terminalsecurity/SCP/SCPServer/src/SCPSession.cpp
--- a/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Fri Jan 22 10:33:42 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Tue Jan 26 12:43:57 2010 +0200
@@ -842,21 +842,31 @@
 // Status : Approved
 // ---------------------------------------------------------
 //
-void CSCPSession::HandleAuthenticationMessageL( const RMessage2 &aMessage )
-    {
+void CSCPSession :: HandleAuthenticationMessageL( const RMessage2 &aMessage ) {
+
     if(!FeatureManager::FeatureSupported(KFeatureIdSapDeviceLockEnhancements))
 	{	
 		FeatureManager::UnInitializeLib();
 		User::Leave(KErrNotSupported);
 	}
-    if ((aMessage.SecureId() != KSCPServerSIDAutolock)&&(aMessage.SecureId() != KAknNfySrvUid)&&
-        (aMessage.SecureId() != KSCPServerSIDGeneralSettings)&&(aMessage.SecureId() != KSCPServerSIDSysAp)&&
-        (aMessage.SecureId() != KSCPServerSIDTerminalControl))
-        {
-        Dprint( (_L("CSCPSession::HandleAuthenticationMessageL():\
-            ERROR: Permission denied") ));
+    
+    TSecureId id = aMessage.SecureId();
+	
+    switch(id.iId) {
+        case KSCPServerSIDAutolock:
+        case KAknNfySrvUid:
+        case KSCPServerSIDGeneralSettings:
+        case KSCPServerSIDSysAp:
+        case KSCPServerSIDTerminalControl:
+        case KSCPServerSIDTelephone:
+        case KSCPServerSIDLog:
+            break;
+        default: {
+            Dprint( (_L("[CSCPSession]-> ERROR: Permission denied") ));
         User::Leave( KErrPermissionDenied );
         }
+    };
+	
     Dprint( (_L("--> CSCPSession::HandleAuthenticationMessage()") ));
     
     HBufC* servBuf = NULL;