Changeset 119 for Mulberry/branches/v4.1d1/Sources_Common/Mail/Control/CPasswordManager.cp

Timestamp:

11/17/07 21:45:05 (1 year ago)

Author:

daboo

Message:

Fixes.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Mail/Control/CPasswordManager.cp (modified) (5 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Mail/Control/CPasswordManager.cp

@@ -120 +120 @@
         }
 }
-#endif
 
-bool CPasswordManager::GetPassword(const CINETAccount* acct, cdstring& pswd)
+bool GetPasswordWithItem(const CINETAccount* acct, cdstring& pswd, SecKeychainItemRef* item);
+bool GetPasswordWithItem(const CINETAccount* acct, cdstring& pswd, SecKeychainItemRef* item)
 {
-#if __dest_os == __mac_os_x
         cdstring server;
         cdstring aname;
@@ -135 +134 @@
         void* data = NULL;
         OSStatus err = ::SecKeychainFindInternetPassword(NULL, server.length(), server.c_str(), 0, NULL, aname.length(), aname.c_str(),
-                                                                                                     0, NULL, port, protocol, authenticationType, &dataLen, &data, NULL);
+                                                                                                     0, NULL, port, protocol, authenticationType, &dataLen, &data, item);
         if (err == noErr)
         {
@@ -144 +143 @@
         else
                 return false;
+}
+#endif
+
+bool CPasswordManager::GetPassword(const CINETAccount* acct, cdstring& pswd)
+{
+#if __dest_os == __mac_os_x
+        return GetPasswordWithItem(acct, pswd, NULL);
 #else
         return false;
@@ -154 +160 @@
         // First verify its not already set
         cdstring current_pswd;
-        if (GetPassword(acct, current_pswd) && (current_pswd == pswd))
+        SecKeychainItemRef item = NULL;
+        if (GetPasswordWithItem(acct, current_pswd, &item) && (current_pswd == pswd))
+        {
+                if (item != NULL)
+                        ::CFRelease(item);
                 return;
+        }
         
         cdstring server;
@@ -164 +175 @@
         GetSecurityDetails(acct, server, aname, port, protocol, authenticationType);
 
-        SecKeychainItemRef item = NULL;
-        OSStatus err = ::SecKeychainAddInternetPassword(NULL, server.length(), server.c_str(), 0, NULL, aname.length(), aname.c_str(),
-                                                                                                  0, NULL, port, protocol, authenticationType, pswd.length(), pswd.c_str(), &item);
-                                                                                                  
-        if (err == errSecDuplicateItem)
+        OSStatus err = noErr;
+        if (item == NULL)
         {
-                err = ::SecKeychainItemModifyAttributesAndData (item, NULL, pswd.length(), pswd.c_str());
+                err = ::SecKeychainAddInternetPassword(NULL, server.length(), server.c_str(), 0, NULL, aname.length(), aname.c_str(),
+                                                                                                  0, NULL, port, protocol, authenticationType, pswd.length(), pswd.c_str(), NULL);
+        }
+        else
+        {
+                err = ::SecKeychainItemModifyAttributesAndData(item, NULL, pswd.length(), pswd.c_str());
+                ::CFRelease(item);
         }
         
-        if (item != NULL)
-                ::CFRelease(item);
 #else
 #endif