summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2005-05-17 10:25:19 (GMT)
committerSteffen Hansen <steffen@kdab.com>2005-05-17 10:25:19 (GMT)
commit08ac16d6da76c20e493717a46241d2a56e18269b (patch)
tree3af54ec921811d937f37d85b67528f6efa655ac9
parent87fca69009d5d614d0d701c106296bb3e460d923 (diff)
downloadkolab-conf-08ac16d6da76c20e493717a46241d2a56e18269b.tar.gz
updated to db from openpkg 2.3.0, better error-handling in filter scripts, and better alias handling in postfix (now the problematic ldap lookup for distribution lists really shows up)
-rw-r--r--conf/templates/main.cf.template2
-rw-r--r--conf/templates/master.cf.template4
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/templates/main.cf.template b/conf/templates/main.cf.template
index 8451e24..e3d1400 100644
--- a/conf/templates/main.cf.template
+++ b/conf/templates/main.cf.template
@@ -152,7 +152,7 @@ ldapvirtual_version = 3
ldapdistlist_server_host = @@@ldap_uri@@@
ldapdistlist_search_base = @@@user_dn_list@@@
ldapdistlist_domain = $mydestination
-ldapdistlist_query_filter = (cn=%u)
+ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(mail=%s))
ldapdistlist_special_result_attribute = member
ldapdistlist_result_attribute = mail
ldapdistlist_result_filter = %s
diff --git a/conf/templates/master.cf.template b/conf/templates/master.cf.template
index cbf40f8..20ed9b6 100644
--- a/conf/templates/master.cf.template
+++ b/conf/templates/master.cf.template
@@ -31,7 +31,7 @@ lmtp unix - - n - - lmtp
#bsmtp unix - n n - - pipe flags=Fq. user=foo argv=/kolab/bin/bsmtp -f $sender $nexthop $recipient
465 inet n - n - - smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
#587 inet n - n - - smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-post-cleanup unix n - n - 0 cleanup
+post-cleanup unix n - n - 0 cleanup -o virtual_maps=
smtp-amavis unix - - n - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -58,7 +58,7 @@ smtp-amavis unix - - n - 2 smtp
# from the automatic invitation handling script
127.0.0.1:10026 inet n - n - - smtpd
-o content_filter=
- -o cleanup_service_name=cleanup
+ -o cleanup_service_name=post-cleanup
-o local_recipient_maps=
-o relay_recipient_maps=
-o smtpd_restriction_classes=