[CalendarServer-changes] [14110] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14110
          http://trac.calendarserver.org//changeset/14110
Author:   sagen at apple.com
Date:     2014-10-27 12:08:31 -0700 (Mon, 27 Oct 2014)
Log Message:
-----------
Support LDAP extra filter

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/twistedcaldav/stdconfig.py
    CalendarServer/trunk/txdav/dps/server.py
    CalendarServer/trunk/txdav/who/util.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-10-27 19:07:48 UTC (rev 14109)
+++ CalendarServer/trunk/requirements-stable.txt	2014-10-27 19:08:31 UTC (rev 14110)
@@ -5,7 +5,7 @@
 # For CalendarServer development, don't try to get these projects from PyPI; use svn.
 
 -e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14107#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14109#egg=twextpy
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14025#egg=pycalendar
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2014-10-27 19:07:48 UTC (rev 14109)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2014-10-27 19:08:31 UTC (rev 14110)
@@ -81,7 +81,8 @@
             "memberDNs": ["uniqueMember", ],
             "readWriteProxy": ["icsContact", ],
             "readOnlyProxy": ["icsSecondaryOwners", ],
-        }
+        },
+        "extra": None,
     },
 }
 

Modified: CalendarServer/trunk/txdav/dps/server.py
===================================================================
--- CalendarServer/trunk/txdav/dps/server.py	2014-10-27 19:07:48 UTC (rev 14109)
+++ CalendarServer/trunk/txdav/dps/server.py	2014-10-27 19:08:31 UTC (rev 14110)
@@ -217,8 +217,8 @@
         if record is not None:
             for field, value in record.fields.iteritems():
                 # FIXME: need to sort out dealing with enormous groups
-                # if field.name == u"memberDNs":
-                #     continue
+                if field.name == u"memberDNs":
+                    continue
                 valueType = record.service.fieldName.valueType(field)
                 if valueType in (unicode, bool):
                     fields[field.name] = value

Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py	2014-10-27 19:07:48 UTC (rev 14109)
+++ CalendarServer/trunk/txdav/who/util.py	2014-10-27 19:08:31 UTC (rev 14110)
@@ -169,7 +169,8 @@
                         relativeDN=params.rdnSchema.addresses,
                         attributes=(),
                     ),
-                })
+                }),
+                extraFilter=params.extra
             )
 
         elif "inmemory" in directoryType:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141027/8c62cd95/attachment.html>