--- a/persistentstorage/centralrepository/cenrepsrv/srvrepos_noc.cpp Fri Apr 16 16:49:27 2010 +0300
+++ b/persistentstorage/centralrepository/cenrepsrv/srvrepos_noc.cpp Mon May 03 14:09:14 2010 +0300
@@ -988,24 +988,24 @@
iRepository = NULL;
}
-TInt CServerRepository::CheckAccessPolicyBeforeMoving(const TClientRequest& aMessage, const TServerSetting& aSourceSetting,
- TUint32 aSourceKey, const TServerSetting& aTargetSetting, TUint32 aTargetKey, TUint32& aErrorKey)
+TInt CServerRepository::CheckAccessPolicyBeforeMoving(const TClientRequest& aMessage, const TServerSetting* aSourceSetting,
+ TUint32 aSourceKey, const TServerSetting* aTargetSetting, TUint32 aTargetKey, TUint32& aErrorKey)
{
TInt error = KErrNone;
- if (&aTargetSetting && !aTargetSetting.IsDeleted())
+ if (aTargetSetting && !aTargetSetting->IsDeleted())
{
error=KErrAlreadyExists;
aErrorKey=aTargetKey;
}
- if (!aMessage.CheckPolicy(GetReadAccessPolicy(aSourceSetting),
+ if (!aMessage.CheckPolicy(GetReadAccessPolicy(*aSourceSetting),
__PLATSEC_DIAGNOSTIC_STRING("CenRep: CServerRepository::MoveL - Attempt made to read a setting")))
{
error = KErrPermissionDenied;
aErrorKey = aSourceKey;
}
- else if (!aMessage.CheckPolicy(GetWriteAccessPolicy(aSourceSetting),
+ else if (!aMessage.CheckPolicy(GetWriteAccessPolicy(*aSourceSetting),
__PLATSEC_DIAGNOSTIC_STRING("CenRep: CServerRepository::MoveL - Attempt made to delete a setting")))
{
error = KErrPermissionDenied;
@@ -1014,7 +1014,7 @@
else if (error == KErrAlreadyExists)
{
// set error to KErrPermissionDenied in preference to KErrAlreadyExists
- if (!aMessage.CheckPolicy(GetWriteAccessPolicy(aTargetSetting),
+ if (!aMessage.CheckPolicy(GetWriteAccessPolicy(*aTargetSetting),
__PLATSEC_DIAGNOSTIC_STRING("CenRep: CServerRepository::MoveL - Attempt made to create a setting")))
{
error = KErrPermissionDenied;