[CalendarServer-changes] [13946] CalendarServer/branches/release/CalendarServer-5.3-dev/ twistedcaldav/directory/ldapdirectory.py

[source_changes at macosforge.org]

Revision: 13946
          http://trac.calendarserver.org//changeset/13946
Author:   cdaboo at apple.com
Date:     2014-09-08 10:45:12 -0700 (Mon, 08 Sep 2014)
Log Message:
-----------
Add exception handler for ldap.INVALID_SYNTAX.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py

Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py	2014-09-08 17:05:32 UTC (rev 13945)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py	2014-09-08 17:45:12 UTC (rev 13946)
@@ -550,6 +550,9 @@
             except ldap.FILTER_ERROR, e:
                 self.log.error("LDAP filter error: %s %s" % (e, filterstr))
                 return []
+            except ldap.INVALID_SYNTAX, e:
+                self.log.error("LDAP invalid syntax: %s %s" % (e, filterstr))
+                return []
             except ldap.SIZELIMIT_EXCEEDED, e:
                 self.log.debug("LDAP result limit exceeded: %d" % (resultLimit,))
             except ldap.TIMELIMIT_EXCEEDED, e:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140908/49e9bff9/attachment-0001.html>