diff -r 10183c6d2913 -r 015fa7494bd2 bluetooth/btstack/secman/pairingserver.cpp --- a/bluetooth/btstack/secman/pairingserver.cpp Wed Sep 15 13:27:26 2010 +0300 +++ b/bluetooth/btstack/secman/pairingserver.cpp Wed Oct 13 15:48:34 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -788,6 +788,7 @@ TBTSockAddr addr; addr.SetBTAddr(addrBuf()); + __ASSERT_DEBUG(!iProxySap, PANIC(KPairingServerFaultCat, EPairingServerObjectAlreadyExists)); iProxySap = CBTProxySAP::NewL(iPhysicalLinksManager, NULL); iStartBondingMsg = aMessage; @@ -812,7 +813,7 @@ security.SetAuthentication(EMitmDesired); security.SetUid(KBluetoothDedicatedBondingUid); - iPhysicalLinksManager.SecMan().AccessRequestL(security, NULL, iProxySap->RemoteAddress(), EDedicatedBonding, *this); + iPhysicalLinksManager.SecMan().AccessRequestL(security, NULL, iProxySap->RemoteAddress(), EDedicatedBonding, EFalse, *this); } void CDedicatedBondingSession::AccessRequestComplete(TInt aResult)