[CalendarServer-changes] [8194] CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py

[source_changes at macosforge.org]

Revision: 8194
          http://trac.macosforge.org/projects/calendarserver/changeset/8194
Author:   sagen at apple.com
Date:     2011-10-14 12:21:33 -0700 (Fri, 14 Oct 2011)
Log Message:
-----------
Treat ldap.INAPPROPRIATE_AUTH as ldap.INVALID_CREDENTIALS

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2011-10-14 19:09:09 UTC (rev 8193)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2011-10-14 19:21:33 UTC (rev 8194)
@@ -432,6 +432,10 @@
                 # Getting here means success, so break the retry loop
                 break
 
+            except ldap.INAPPROPRIATE_AUTH:
+                # Seen when using an empty password, treat as invalid creds
+                raise ldap.INVALID_CREDENTIALS()
+
             except ldap.INVALID_CREDENTIALS:
                 raise
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111014/9387a756/attachment.html>