[CalendarServer-changes] [2022]
CalendarServer/branches/release/CalendarServer-1.1-dev
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 26 11:34:57 PST 2007
Revision: 2022
http://trac.macosforge.org/projects/calendarserver/changeset/2022
Author: wsanchez at apple.com
Date: 2007-11-26 11:34:56 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
Pulled up r2021 r2020 from trunk.
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-1.1-dev/conf/accounts-test.xml
CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/directory/principal.py
Modified: CalendarServer/branches/release/CalendarServer-1.1-dev/conf/accounts-test.xml
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.1-dev/conf/accounts-test.xml 2007-11-26 19:01:09 UTC (rev 2021)
+++ CalendarServer/branches/release/CalendarServer-1.1-dev/conf/accounts-test.xml 2007-11-26 19:34:56 UTC (rev 2022)
@@ -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/branches/release/CalendarServer-1.1-dev/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/directory/principal.py 2007-11-26 19:01:09 UTC (rev 2021)
+++ CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/directory/principal.py 2007-11-26 19:34:56 UTC (rev 2022)
@@ -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/b0d813c9/attachment.html
More information about the calendarserver-changes
mailing list