1.1 --- a/README.txt Sat Dec 20 01:26:51 2014 +0100
1.2 +++ b/README.txt Sat Dec 20 01:54:20 2014 +0100
1.3 @@ -135,7 +135,15 @@
1.4 https://tools.ietf.org/html/draft-lachman-ldap-mail-routing-03
1.5
1.6 Resource schemas for LDAP are not effectively standardised for the purposes of
1.7 -this software.
1.8 +this software. A useful object class, inetResource, was defined for the
1.9 +iPlanet Calendar Server:
1.10 +
1.11 + http://docs.oracle.com/cd/E19566-01/819-4437/6n6jckqrf/index.html#anocg
1.12 + http://docs.oracle.com/cd/E19566-01/819-4437/6n6jckqr8/index.html
1.13 +
1.14 +Although Kolab maintains notions of resources, they are tied up with the
1.15 +notion of a shared folder and the kolabSharedFolder object class, although the
1.16 +mailRecipient object class is employed by resources in Kolab.
1.17
1.18 Configuring Mail Systems for Mail Delivery
1.19 ------------------------------------------
2.1 --- a/conf/exim/890_exim4-config_ldap_resources Sat Dec 20 01:26:51 2014 +0100
2.2 +++ b/conf/exim/890_exim4-config_ldap_resources Sat Dec 20 01:54:20 2014 +0100
2.3 @@ -1,4 +1,4 @@
2.4 -LDAP_RESOURCE_QUERY = (&(|(mail=${quote_ldap:${local_part}}@${domain})(alias=${quote_ldap:${local_part}}@${domain}))(kolabFolderType=event))
2.5 +LDAP_RESOURCE_QUERY = (&(|(mail=${quote_ldap:${local_part}}@${domain})(alias=${quote_ldap:${local_part}}@${domain}))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient)))
2.6
2.7 ldap_resource:
2.8 debug_print = "R: ldap_resource for $local_part@$domain"
2.9 @@ -6,7 +6,7 @@
2.10 condition = ${if eq {}{${lookup ldap{ \
2.11 user="$ldap_service_bind_dn" \
2.12 pass=$ldap_service_password \
2.13 - ldap://$ldap_host:$ldap_port/$ldap_base_dn?kolabtargetfolder?sub?LDAP_RESOURCE_QUERY} \
2.14 + ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_RESOURCE_QUERY} \
2.15 }}{no}{yes}}
2.16 transport = resources_transport
2.17 cannot_route_message = Unknown user
3.1 --- a/conf/postfix/virtual_alias_maps_resources.cf Sat Dec 20 01:26:51 2014 +0100
3.2 +++ b/conf/postfix/virtual_alias_maps_resources.cf Sat Dec 20 01:54:20 2014 +0100
3.3 @@ -9,6 +9,6 @@
3.4 bind_dn = $ldap_service_bind_dn
3.5 bind_pw = $ldap_service_password
3.6
3.7 -query_filter = (&(|(mail=%s)(alias=%s))(objectclass=kolabsharedfolder)(kolabFolderType=event))
3.8 +query_filter = (&(|(mail=%s)(alias=%s))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient)))
3.9 result_attribute = mail
3.10 result_format = <resources+%s>