Skip to content
This repository has been archived by the owner on Feb 13, 2020. It is now read-only.

Commit

Permalink
Other config changes are causing the passwords to be refetched, so do…
Browse files Browse the repository at this point in the history
…n't refetch

 if we already have the passwords.

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk@5443 e27351fd-9f3e-4f54-a53b-843176b1656c
  • Loading branch information
m0rgen committed Apr 7, 2010
1 parent 128bc08 commit 91e2364
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions twistedcaldav/stdconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,10 @@ def _updateNotifications(configDict):
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:
Expand Down Expand Up @@ -882,6 +886,10 @@ def _updateScheduling(configDict):

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"]:
Expand Down

0 comments on commit 91e2364

Please sign in to comment.