[CalendarServer-changes] [5443] CalendarServer/trunk/twistedcaldav/stdconfig.py

[source_changes at macosforge.org]

Revision: 5443
          http://trac.macosforge.org/projects/calendarserver/changeset/5443
Author:   sagen at apple.com
Date:     2010-04-07 13:08:19 -0700 (Wed, 07 Apr 2010)
Log Message:
-----------
Other config changes are causing the passwords to be refetched, so don't refetch
 if we already have the passwords.

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

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-04-07 20:00:47 UTC (rev 5442)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-04-07 20:08:19 UTC (rev 5443)
@@ -848,6 +848,10 @@
             service["Service"] == "twistedcaldav.notify.XMPPNotifierService" and
             service["Enabled"]
         ):
+            # If we already have the password, don't fetch it again
+            if service["Password"]:
+                continue
+
             # Get password from keychain.  If not there, fall back to what
             # is in the plist.
             try:
@@ -882,6 +886,10 @@
 
     if service["Enabled"]:
 
+        # If we already have the password, don't fetch it again
+        if service["Password"]:
+            return
+
         # Get password for the user that is allowed to inject iMIP replies
         # to the server's /inbox; if not available, fall back to plist
         if service["Username"]:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100407/9721a9e5/attachment.html>