[CalendarServer-changes] [3262] CalendarServer/trunk/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 3262
          http://trac.macosforge.org/projects/calendarserver/changeset/3262
Author:   wsanchez at apple.com
Date:     2008-10-29 16:27:30 -0700 (Wed, 29 Oct 2008)
Log Message:
-----------
Cope with a directory service that has no defaults.

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

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2008-10-29 18:57:02 UTC (rev 3261)
+++ CalendarServer/trunk/twistedcaldav/config.py	2008-10-29 23:27:30 UTC (rev 3262)
@@ -400,14 +400,15 @@
                     self._data["DirectoryService"]["params"] = {}
 
         for param in items.get("DirectoryService", {}).get("params", {}):
-            if param not in serviceDefaultParams[dsType]:
+            if dsType in serviceDefaultParams and param not in serviceDefaultParams[dsType]:
                 raise ConfigurationError("Parameter %s is not supported by service %s" % (param, dsType))
 
         _mergeData(self._data, items)
 
-        for param in tuple(self._data["DirectoryService"]["params"]):
-            if param not in serviceDefaultParams[self._data["DirectoryService"]["type"]]:
-                del self._data["DirectoryService"]["params"][param]
+        if self._data["DirectoryService"]["type"] in serviceDefaultParams:
+            for param in tuple(self._data["DirectoryService"]["params"]):
+                if param not in serviceDefaultParams[self._data["DirectoryService"]["type"]]:
+                    del self._data["DirectoryService"]["params"][param]
 
     @staticmethod
     def updateACLs(self, items):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081029/def54853/attachment.html>