Security-57337.60.2.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / StorageManager.h

diff --git a/OSX/libsecurity_keychain/lib/StorageManager.h b/OSX/libsecurity_keychain/lib/StorageManager.h
index edd02841af76e95140c66987cef0d6cc5b1424f8..b1f82cf40092fcdb64414bb460118defbcfee174 100644 (file)
--- a/OSX/libsecurity_keychain/lib/StorageManager.h
+++ b/OSX/libsecurity_keychain/lib/StorageManager.h
@@ -92,6 +92,8 @@ public:
        // Create KC if it doesn't exist, add it to the search list if it exists and is not already on it.
     Keychain makeKeychain(const DLDbIdentifier &dLDbIdentifier, bool add = true);
 
        // Create KC if it doesn't exist, add it to the search list if it exists and is not already on it.
     Keychain makeKeychain(const DLDbIdentifier &dLDbIdentifier, bool add = true);
 

+    // Reload a keychain from the on-disk database
+    void reloadKeychain(Keychain keychain);

 
        // Keychain list maintenance
 
 
        // Keychain list maintenance
 


@@ -155,14 +157,17 @@ private:
        static void convertList(DLDbList &ids, const KeychainList &kcs);
        void convertList(KeychainList &kcs, const DLDbList &ids);
 
        static void convertList(DLDbList &ids, const KeychainList &kcs);
        void convertList(KeychainList &kcs, const DLDbList &ids);
 

+    DLDbIdentifier makeDLDbIdentifier(const char* pathName);
+    CssmClient::Db makeDb(DLDbIdentifier dLDbIdentifier);
+

     // Only add if not there yet.  Writes out CFPref and broadcasts KCPrefListChanged notification
        void addAndNotify(const Keychain& keychainToAdd);
 
        // remove a keychain from the sync list
        void removeKeychainFromSyncList (const DLDbIdentifier &id);
 
     // Only add if not there yet.  Writes out CFPref and broadcasts KCPrefListChanged notification
        void addAndNotify(const Keychain& keychainToAdd);
 
        // remove a keychain from the sync list
        void removeKeychainFromSyncList (const DLDbIdentifier &id);
 

-    typedef map<DLDbIdentifier, __weak KeychainImpl *> KeychainMap;
-       // Weak reference map of all keychains we know about that aren't deleted
+    typedef map<DLDbIdentifier, KeychainImpl *> KeychainMap;
+       // Reference map of all keychains we know about that aren't deleted

        // or removed
     KeychainMap mKeychains;
 
        // or removed
     KeychainMap mKeychains;