[CalendarServer-changes] [2021] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 2021
          http://trac.macosforge.org/projects/calendarserver/changeset/2021
Author:   cdaboo at apple.com
Date:     2007-11-26 11:01:09 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Attempt to schedule using a principal that is not enabled for calendaring should be handled properly.

Modified Paths:
--------------
    CalendarServer/trunk/conf/accounts-test.xml
    CalendarServer/trunk/twistedcaldav/directory/principal.py

Modified: CalendarServer/trunk/conf/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/accounts-test.xml	2007-11-26 18:55:53 UTC (rev 2020)
+++ CalendarServer/trunk/conf/accounts-test.xml	2007-11-26 19:01:09 UTC (rev 2021)
@@ -65,4 +65,14 @@
       <member type="users">user01</member>
     </members>
   </group>
+  <group>
+    <uid>disabledgroup</uid>
+    <guid>disabledgroup</guid>
+    <password>disabledgroup</password>
+    <name>Disabled Group</name>
+    <members>
+      <member type="users">user01</member>
+    </members>
+    <disable-calendar/>
+  </group>
 </accounts>

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-11-26 18:55:53 UTC (rev 2020)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-11-26 19:01:09 UTC (rev 2021)
@@ -178,7 +178,7 @@
     def principalForCalendarUserAddress(self, address):
         # First see if the address is a principal URI
         principal = self._principalForURI(address)
-        if principal:
+        if principal and isinstance(principal, DirectoryCalendarPrincipalResource):
             return principal
 
         # Next try looking it up in the directory

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20071126/9acf1070/attachment.html