Ticket #260: aym-ldapdir-fix01.diff

ldapdirectory.py

@@ -146 +146 @@
         uid = None
 
         # Find or build email
-        emailAddresses = self._getMultipleLdapAttributes(attrs, 'mail')
+        emailAddresses = set(map(lambda v: 'mailto:' + v, self._getMultipleLdapAttributes(attrs, 'mail')))
+
         emailSuffix = self._rdnSchema[recordType]['emailSuffix']
         if len(emailAddresses) == 0 and emailSuffix is not None:
             emailPrefix = self._getUniqueLdapAttribute(attrs, self._rdnSchema[recordType]['attr'])
-            emailAddresses.add(emailPrefix + emailSuffix)
+            emailAddresses.add('mailto:' + emailPrefix + emailSuffix)
 
         # LDAP attribute -> principal matchings
         if recordType == DirectoryService.recordType_users:
@@ -165 +166 @@
             fullName = self._getUniqueLdapAttribute(attrs, 'cn')
             calendarUserAddresses   = emailAddresses
             enabledForCalendaring   = True
+        elif recordType in (DirectoryService.recordType_resources, DirectoryService.recordType_locations):
+            shortName = self._getUniqueLdapAttribute(attrs, 'cn')
+            fullName = self._getUniqueLdapAttribute(attrs, 'cn')
+            calendarUserAddresses   = emailAddresses
+            enabledForCalendaring   = True
+            autoSchedule = True
 
         return LdapDirectoryRecord(
             service     = self,
@@ -352 +359 @@
 
     def readOnlyProxyFor(self, read_write=True):
         return ()
+    
+    # Returns true regardless of the type. We want to be able to add delegation to
+    # locations and resources, due to the complete lack of a directory-based
+    # mechanism to create proxies
+    def hasEditableProxyMembership(self):
+        return True
 
     # Credentials are checked against the LDAP server
     # Thus, the password is needed in clear-text and digest authentication