Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_cdsa_plugin / lib / DatabaseSession.cpp

diff --git a/OSX/libsecurity_cdsa_plugin/lib/DatabaseSession.cpp b/OSX/libsecurity_cdsa_plugin/lib/DatabaseSession.cpp
index 1930ad9c3465073c38fb6371f473bf6b1895592f..723b1e2f5ef6a006ae23be4927553f46eb9af9c8 100644 (file)
--- a/OSX/libsecurity_cdsa_plugin/lib/DatabaseSession.cpp
+++ b/OSX/libsecurity_cdsa_plugin/lib/DatabaseSession.cpp
@@ -82,7 +82,7 @@ DatabaseSession::DbDelete(const char *inDbName,
 {
     // The databaseManager will notify all its DbContext instances
     // that the database is question is being deleted.
 {
     // The databaseManager will notify all its DbContext instances
     // that the database is question is being deleted.

-       secnotice("dbsession", "DbDelete of %s", inDbName); 
+       secinfo("dbsession", "DbDelete of %s", inDbName);

     mDatabaseManager.dbDelete(*this, DbName(inDbName, CssmNetAddress::optional(inDbLocation)), inAccessCred);
 }
 
     mDatabaseManager.dbDelete(*this, DbName(inDbName, CssmNetAddress::optional(inDbLocation)), inAccessCred);
 }
 


@@ -97,7 +97,7 @@ DatabaseSession::DbCreate(const char *inDbName,
                           CSSM_DB_HANDLE &outDbHandle)
 {
        outDbHandle = CSSM_INVALID_HANDLE;      // CDSA 2.0 says to set this if we fail
                           CSSM_DB_HANDLE &outDbHandle)
 {
        outDbHandle = CSSM_INVALID_HANDLE;      // CDSA 2.0 says to set this if we fail

-       secnotice("dbsession", "DbCreate of %s", inDbName);
+       secinfo("dbsession", "DbCreate of %s", inDbName);

        
     outDbHandle = insertDbContext(mDatabaseManager.dbCreate(*this,
                                                             DbName(inDbName, CssmNetAddress::optional(inDbLocation)),
        
     outDbHandle = insertDbContext(mDatabaseManager.dbCreate(*this,
                                                             DbName(inDbName, CssmNetAddress::optional(inDbLocation)),


@@ -117,7 +117,7 @@ DatabaseSession::DbOpen(const char *inDbName,
                         CSSM_DB_HANDLE &outDbHandle)
 {
        DOCDebug("DatabaseSession::DbOpen: dbName %s", inDbName);
                         CSSM_DB_HANDLE &outDbHandle)
 {
        DOCDebug("DatabaseSession::DbOpen: dbName %s", inDbName);

-       secnotice("dbsession", "DbOpen of %s", inDbName);
+       secinfo("dbsession", "DbOpen of %s", inDbName);

        outDbHandle = CSSM_INVALID_HANDLE;      // CDSA 2.0 says to set this if we fail 
     outDbHandle = insertDbContext(mDatabaseManager.dbOpen(*this,
                                                           DbName(inDbName, CssmNetAddress::optional(inDbLocation)),
        outDbHandle = CSSM_INVALID_HANDLE;      // CDSA 2.0 says to set this if we fail 
     outDbHandle = insertDbContext(mDatabaseManager.dbOpen(*this,
                                                           DbName(inDbName, CssmNetAddress::optional(inDbLocation)),


@@ -192,7 +192,7 @@ DatabaseSession::DbClose(CSSM_DB_HANDLE inDbHandle)
     DbContextMap::iterator it = mDbContextMap.find(inDbHandle);
     if (it == mDbContextMap.end())
         CssmError::throwMe(CSSM_ERRCODE_INVALID_DB_HANDLE);
     DbContextMap::iterator it = mDbContextMap.find(inDbHandle);
     if (it == mDbContextMap.end())
         CssmError::throwMe(CSSM_ERRCODE_INVALID_DB_HANDLE);

-    auto_ptr<DbContext> aDbContext(it->second);
+    unique_ptr<DbContext> aDbContext(it->second);

     mDbContextMap.erase(it);
     mDatabaseManager.dbClose(*aDbContext);
 }
     mDbContextMap.erase(it);
     mDatabaseManager.dbClose(*aDbContext);
 }