X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/5c19dc3ae3bd8e40a9c028b0deddd50ff337692c..refs/heads/master:/OSX/libsecurity_cdsa_plugin/lib/Database.cpp diff --git a/OSX/libsecurity_cdsa_plugin/lib/Database.cpp b/OSX/libsecurity_cdsa_plugin/lib/Database.cpp index ef7da434..f34f5ba4 100644 --- a/OSX/libsecurity_cdsa_plugin/lib/Database.cpp +++ b/OSX/libsecurity_cdsa_plugin/lib/Database.cpp @@ -39,7 +39,7 @@ DatabaseManager::get (const DbName &inDbName) DatabaseMap::iterator anIterator = mDatabaseMap.find (inDbName); if (anIterator == mDatabaseMap.end()) { - auto_ptr aDatabase(make(inDbName)); + unique_ptr aDatabase(make(inDbName)); mDatabaseMap.insert(DatabaseMap::value_type(aDatabase->mDbName, aDatabase.get())); return aDatabase.release(); } @@ -164,7 +164,7 @@ Database::_dbOpen(DatabaseSession &inDatabaseSession, const AccessCredentials *inAccessCred, const void *inOpenParameters) { - auto_ptraDbContext(makeDbContext(inDatabaseSession, + unique_ptraDbContext(makeDbContext(inDatabaseSession, inAccessRequest, inAccessCred, inOpenParameters)); @@ -195,7 +195,7 @@ Database::_dbCreate(DatabaseSession &inDatabaseSession, const CSSM_RESOURCE_CONTROL_CONTEXT *inCredAndAclEntry, const void *inOpenParameters) { - auto_ptraDbContext(makeDbContext(inDatabaseSession, + unique_ptraDbContext(makeDbContext(inDatabaseSession, inAccessRequest, (inCredAndAclEntry ? AccessCredentials::optional(inCredAndAclEntry->AccessCred)