--- a/supl/locationsuplfw/gateway/src/epos_csuplserver.cpp	Wed Sep 15 12:40:28 2010 +0300
+++ b/supl/locationsuplfw/gateway/src/epos_csuplserver.cpp	Wed Oct 13 15:01:35 2010 +0300
@@ -142,8 +142,8 @@
     // Settings
     TInt keyValue;
     TInt err = KErrNone;
-    CRepository* repository = NULL;
-    TRAP(err, repository = CRepository::NewL(KCRUidSuplConfiguration));
+    
+    CRepository* repository = CRepository::NewL(KCRUidSuplConfiguration);
     CleanupStack::PushL(repository);
     
     if (err != KErrNone)
@@ -264,7 +264,7 @@
         }
 
     //if secure id is not equal to KSuplWapSecureId or KSuplWapSecureId, then perform capability check
-    if ((aMessage.SecureId() != KSuplWapSecureId && aMessage.SecureId() != KNetworkGatewaySID && aMessage.SecureId() != 0x102869DF))
+    if ((aMessage.SecureId() != KSuplWapSecureId && aMessage.SecureId() != KNetworkGatewaySID))
     	{
         if (!aMessage.HasCapability(ECapabilityCommDD))
             {
@@ -322,11 +322,8 @@
     static _LIT_SECURITY_POLICY_S0(allowSuplWapPolicy, KSuplWapSecureId);
     TBool isSuplWap = allowSuplWapPolicy().CheckPolicy(aMessage); 
     
-    static _LIT_SECURITY_POLICY_S0(allowlocationserverPolicy, 0x102869DF);
-       TBool islocationserver = allowlocationserverPolicy().CheckPolicy(aMessage); 
-       
-       //Check if the request was made by one of the allowed processes else check for required capability
-       if (!isNetworkGateway && !isSuplWap && !islocationserver)
+    //Check if the request was made by one of the allowed processes else check for required capability
+    if (!isNetworkGateway && !isSuplWap )
         {
         if (!aMessage.HasCapability(ECapabilityCommDD))
             {