# HG changeset patch # User Paul Boddie # Date 1446155652 -3600 # Node ID 5ffd38e7b5fd123aa842c6c6dca970aef20753c9 # Parent ed234891467b7acfa748f6ce2db2c0b97a893bcc Formatted the LDAP queries. diff -r ed234891467b -r 5ffd38e7b5fd conf/exim/ldap/010_exim4-config_ldap_people_outgoing --- a/conf/exim/ldap/010_exim4-config_ldap_people_outgoing Thu Oct 29 18:54:11 2015 +0100 +++ b/conf/exim/ldap/010_exim4-config_ldap_people_outgoing Thu Oct 29 22:54:12 2015 +0100 @@ -1,4 +1,6 @@ -LDAP_PERSON_OUTGOING_QUERY = (&(|(mail=${quote_ldap:${sender_address_local_part}}@${sender_address_domain})(alias=${quote_ldap:${sender_address_local_part}}@${sender_address_domain}))(objectclass=inetorgperson)) +LDAP_PERSON_OUTGOING_QUERY = (&(|(mail=${quote_ldap:${sender_address_local_part}@${sender_address_domain}})\ + (alias=${quote_ldap:${sender_address_local_part}@${sender_address_domain}}))\ + (objectclass=inetorgperson)) ldap_person_outgoing: debug_print = "R: ldap_person_outgoing for $sender_address_local_part@$sender_address_domain" diff -r ed234891467b -r 5ffd38e7b5fd conf/exim/ldap/020_exim4-config_ldap_people --- a/conf/exim/ldap/020_exim4-config_ldap_people Thu Oct 29 18:54:11 2015 +0100 +++ b/conf/exim/ldap/020_exim4-config_ldap_people Thu Oct 29 22:54:12 2015 +0100 @@ -1,4 +1,6 @@ -LDAP_PERSON_QUERY = (&(|(mail=${quote_ldap:${local_part}}@${domain})(alias=${quote_ldap:${local_part}}@${domain}))(objectclass=inetorgperson)) +LDAP_PERSON_QUERY = (&(|(mail=${quote_ldap:${local_part}@${domain}})\ + (alias=${quote_ldap:${local_part}@${domain}}))\ + (objectclass=inetorgperson)) ldap_person: debug_print = "R: ldap_person for $local_part@$domain" diff -r ed234891467b -r 5ffd38e7b5fd conf/exim/ldap/020_exim4-config_ldap_resources --- a/conf/exim/ldap/020_exim4-config_ldap_resources Thu Oct 29 18:54:11 2015 +0100 +++ b/conf/exim/ldap/020_exim4-config_ldap_resources Thu Oct 29 22:54:12 2015 +0100 @@ -1,4 +1,6 @@ -LDAP_RESOURCE_QUERY = (&(|(mail=${quote_ldap:${local_part}}@${domain})(alias=${quote_ldap:${local_part}}@${domain}))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient))) +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"