# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1419036860 -3600
# Node ID 35850f0a96e0736fa1c823acd4a1e129a958386f
# Parent  4d19192e3cf174ac45057258b3c3003979f7d97c
Removed Kolab schema references from resource searches.

diff -r 4d19192e3cf1 -r 35850f0a96e0 README.txt
--- a/README.txt	Sat Dec 20 01:26:51 2014 +0100
+++ b/README.txt	Sat Dec 20 01:54:20 2014 +0100
@@ -135,7 +135,15 @@
   https://tools.ietf.org/html/draft-lachman-ldap-mail-routing-03
 
 Resource schemas for LDAP are not effectively standardised for the purposes of
-this software.
+this software. A useful object class, inetResource, was defined for the
+iPlanet Calendar Server:
+
+  http://docs.oracle.com/cd/E19566-01/819-4437/6n6jckqrf/index.html#anocg
+  http://docs.oracle.com/cd/E19566-01/819-4437/6n6jckqr8/index.html
+
+Although Kolab maintains notions of resources, they are tied up with the
+notion of a shared folder and the kolabSharedFolder object class, although the
+mailRecipient object class is employed by resources in Kolab.
 
 Configuring Mail Systems for Mail Delivery
 ------------------------------------------
diff -r 4d19192e3cf1 -r 35850f0a96e0 conf/exim/890_exim4-config_ldap_resources
--- a/conf/exim/890_exim4-config_ldap_resources	Sat Dec 20 01:26:51 2014 +0100
+++ b/conf/exim/890_exim4-config_ldap_resources	Sat Dec 20 01:54:20 2014 +0100
@@ -1,4 +1,4 @@
-LDAP_RESOURCE_QUERY = (&(|(mail=${quote_ldap:${local_part}}@${domain})(alias=${quote_ldap:${local_part}}@${domain}))(kolabFolderType=event))
+LDAP_RESOURCE_QUERY = (&(|(mail=${quote_ldap:${local_part}}@${domain})(alias=${quote_ldap:${local_part}}@${domain}))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient)))
 
 ldap_resource:
   debug_print = "R: ldap_resource for $local_part@$domain"
@@ -6,7 +6,7 @@
   condition = ${if eq {}{${lookup ldap{ \
     user="$ldap_service_bind_dn" \
     pass=$ldap_service_password \
-    ldap://$ldap_host:$ldap_port/$ldap_base_dn?kolabtargetfolder?sub?LDAP_RESOURCE_QUERY} \
+    ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_RESOURCE_QUERY} \
     }}{no}{yes}}
   transport = resources_transport
   cannot_route_message = Unknown user
diff -r 4d19192e3cf1 -r 35850f0a96e0 conf/postfix/virtual_alias_maps_resources.cf
--- a/conf/postfix/virtual_alias_maps_resources.cf	Sat Dec 20 01:26:51 2014 +0100
+++ b/conf/postfix/virtual_alias_maps_resources.cf	Sat Dec 20 01:54:20 2014 +0100
@@ -9,6 +9,6 @@
 bind_dn = $ldap_service_bind_dn
 bind_pw = $ldap_service_password
 
-query_filter = (&(|(mail=%s)(alias=%s))(objectclass=kolabsharedfolder)(kolabFolderType=event))
+query_filter = (&(|(mail=%s)(alias=%s))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient)))
 result_attribute = mail
 result_format = <resources+%s>