Security-59306.61.1.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 33f030338376ba102afb553c598c4111fc5f20cb..520823fcfc17db115ce164fb6938855635f3010b 100644 (file)
--- a/OSX/libsecurity_keychain/lib/StorageManager.h
+++ b/OSX/libsecurity_keychain/lib/StorageManager.h
@@ -113,7 +113,7 @@ public:
        void setSearchList(SecPreferencesDomain domain, const KeychainList &keychainList);
 
     void rename(Keychain keychain, const char* newName);
        void setSearchList(SecPreferencesDomain domain, const KeychainList &keychainList);
 
     void rename(Keychain keychain, const char* newName);

-    void renameUnique(Keychain keychain, CFStringRef newName, bool appendDbSuffix);
+    void renameUnique(Keychain keychain, CFStringRef oldName, CFStringRef newName, bool appendDbSuffix);

 
        // Iff keychainOrArray is NULL return the default KeychainList in keychainList otherwise
        // if keychainOrArray is a CFArrayRef containing SecKeychainRef's convernt it to KeychainList,
 
        // Iff keychainOrArray is NULL return the default KeychainList in keychainList otherwise
        // if keychainOrArray is a CFArrayRef containing SecKeychainRef's convernt it to KeychainList,


@@ -147,6 +147,8 @@ public:
        void defaultKeychain(const Keychain &keychain);
 
        Keychain loginKeychain();
        void defaultKeychain(const Keychain &keychain);
 
        Keychain loginKeychain();

+    DLDbIdentifier loginKeychainDLDbIdentifer();
+

        void loginKeychain(Keychain keychain);
        
        Keychain defaultKeychain(SecPreferencesDomain domain);
        void loginKeychain(Keychain keychain);
        
        Keychain defaultKeychain(SecPreferencesDomain domain);


@@ -184,6 +186,9 @@ public:
     //  Otherwise, leave it alone.
     static DLDbIdentifier mungeDLDbIdentifier(const DLDbIdentifier& dLDbIdentifier, bool isReset);
 
     //  Otherwise, leave it alone.
     static DLDbIdentifier mungeDLDbIdentifier(const DLDbIdentifier& dLDbIdentifier, bool isReset);
 

+    // Change the DLDbIdentifier to always use the pattern ending with "-db".
+    static DLDbIdentifier forceMungeDLDbIDentifier(const DLDbIdentifier& dLDbIdentifier);
+

     // Due to compatibility requirements, we need the DLDbListCFPref lists to
     // never see a ".keychain-db" filename. Call this function to give them what
     // they need.
     // Due to compatibility requirements, we need the DLDbListCFPref lists to
     // never see a ".keychain-db" filename. Call this function to give them what
     // they need.