[CalendarServer-changes] [6418] CalendarServer/trunk/twistedcaldav/notify.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 13 11:17:40 PDT 2010
Revision: 6418
http://trac.macosforge.org/projects/calendarserver/changeset/6418
Author: sagen at apple.com
Date: 2010-10-13 11:17:39 -0700 (Wed, 13 Oct 2010)
Log Message:
-----------
Removing hack which ignores advertisement of digest auth by XMPP server
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/notify.py
Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py 2010-10-13 17:49:27 UTC (rev 6417)
+++ CalendarServer/trunk/twistedcaldav/notify.py 2010-10-13 18:17:39 UTC (rev 6418)
@@ -80,30 +80,7 @@
"getXMPPSettings",
]
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# FIXME:
-# Temporarily ignore digest auth as it's broken for local accounts
-
-NS_XMPP_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl'
-
-from twisted.words.protocols.jabber import sasl
-def get_mechanisms(xs):
- """
- Parse the SASL feature to extract the available mechanism names.
- """
- mechanisms = []
- for element in xs.features[(NS_XMPP_SASL, 'mechanisms')].elements():
- if element.name == 'mechanism':
- mechanism = str(element)
- if mechanism != "DIGEST-MD5":
- mechanisms.append(str(element))
-
- return mechanisms
-
-sasl.get_mechanisms = get_mechanisms
-
-
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Classes used within calendarserver itself
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101013/7c0af3f9/attachment.html>
More information about the calendarserver-changes
mailing list