diff -r 703a2b94c06c -r dde4619868dc usbclasses/usbphoneasmodem/classimplementation/mscfileserver/inc/mscfileserversecuritypolicy.h --- a/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/inc/mscfileserversecuritypolicy.h Wed Sep 15 13:20:24 2010 +0300 +++ b/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/inc/mscfileserversecuritypolicy.h Wed Oct 13 15:41:46 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -21,21 +21,24 @@ // USB masss storage Server Security Policy Definition -const TUint KUsbMsServerRangeCount = 2; +const TUint KUsbMsServerRangeCount = 3; const TInt KUsbMsServerRanges[KUsbMsServerRangeCount] = { - EMscFileSetupLu, // NetworkControl [SetupLogicalUnitL/StartL/Stop/Shutdown] + EMscFileStart, // NetworkControl [StartL/Stop] + EMscFileShutdown, // DiskAdmin [Shutdown] EMscFileShutdown + 1, // fail (to KMaxInt) }; // Index numbers into KUsbMsServerElements[] const TInt KPolicyNetworkControl = 0; +const TInt KPolicyDiskAdmin = 1; // Mapping IPCs to poicy element const TUint8 KUsbMsServerElementsIndex[KUsbMsServerRangeCount] = { - KPolicyNetworkControl, // EMscFileSetupLu, EMscFileStart, EMscFileStop, EMscFileShutdown + KPolicyNetworkControl, // EMscFileStart & EMscFileStop + KPolicyDiskAdmin, // EMscFileShutdown CPolicyServer::ENotSupported, // EMscFileShutdown + 1 to KMaxTInt }; @@ -43,6 +46,7 @@ const CPolicyServer::TPolicyElement KUsbMsServerElements[] = { { _INIT_SECURITY_POLICY_C1(ECapabilityNetworkControl), CPolicyServer::EFailClient }, + { _INIT_SECURITY_POLICY_C1(ECapabilityDiskAdmin), CPolicyServer::EFailClient}, // the EFailClient means that if the check fails // the CheckFailed method with return KErrPermissionDenied };