[CalendarServer-changes] [4012] CalendarServer/trunk/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 4012
          http://trac.macosforge.org/projects/calendarserver/changeset/4012
Author:   sagen at apple.com
Date:     2009-04-13 17:48:34 -0700 (Mon, 13 Apr 2009)
Log Message:
-----------
SMTP password lookup needs to be based on the username and server fields, not the sender email address

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2009-04-13 23:28:19 UTC (rev 4011)
+++ CalendarServer/trunk/twistedcaldav/config.py	2009-04-14 00:48:34 UTC (rev 4012)
@@ -699,11 +699,10 @@
                     # Get password from keychain.  If not there, fall back to
                     # what is in the plist.
                     try:
-                        if direction == "Sending":
-                            account = service.Sending.Address
-                        else:
-                            account = "%s@%s" % (service.Receiving.Username,
-                                service.Receiving.Server)
+                        account = "%s@%s" % (
+                            service[direction].Username,
+                            service[direction].Server
+                        )
                         password = getPasswordFromKeychain(account)
                         service[direction]["Password"] = password
                         log.info("iMIP %s password successfully retreived from keychain" % (direction,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090413/0d149978/attachment.html>