Commits

Zhang Huangbin committed be81bff

Fixed: not detect domain backup mx status in OpenLDAP backend for domain transport.

Comments (0)

Files changed (3)

iRedMail/ChangeLog

 iRedMail-0.8.6:
     * Works on new Linux/BSD distribution releases:
         - Works on Ubuntu 13.10 (saucy). NOTE: phpLDAPadmin is not available
-          for OpenLDAP bacend because it cannot be installed at all.
-        - openSUSE-13.1. Testd with openSUSE 13.1 RC2.
+          for OpenLDAP backend because it cannot be installed at all.
+        - openSUSE-13.1.
         - OpenBSD 5.4, plus Awstats support.
 
     * Drop support for below releases:
 
     * Drop support for below Linux distribution:
         + Gentoo. Just few users chose Gentoo, so we decided to drop it to
-          reduce our workload and bring you better support for supported
+          reduce our workload and bring you better support for other supported
           Linux/BSD distributions.
 
     * Better support for installing iRedMail with remote MySQL server.
       white/black/greylisting, throttling.
 
     * Fixed issues:
-        + Not detect backupmx status in domain transport map.
+        + Not detect backupmx status in SQL/LDAP query for domain transport.
         + Add cron job to cleanup expired entries in Cluebringer database.
         + Add 'inet6 => 0' in Amavisd ldap settings to avoid ldap connection
           error.

iRedMail/functions/amavisd.sh

 \$bad_header_quarantine_method = undef;
 
 # Quarantine SPAM.
-#\$spam_quarantine_to = 'spam-quarantine';
-
-# Quarantine method. How to store mail body.
+# Where to store quarantined mail message:
 #   - 'local:spam-%i-%m', quarantine mail on local file system.
 #   - 'sql:', quarantine mail in SQL server specified in @storage_sql_dsn. 
 #   - undef, do not quarantine mail.
+\$spam_quarantine_method = undef;
 #\$spam_quarantine_method = 'sql:';
-\$spam_quarantine_method = undef;
+#\$spam_quarantine_to = 'spam-quarantine';
 
 #########################
 # Quarantine VIRUS mails.

iRedMail/samples/postfix/ldap/transport_maps_domain.cf

 bind_pw         = RBUuFDo31MJbLkJgrwkaKkmRg7Cldw
 search_base     = PH_LDAP_BASEDN
 scope           = one
-query_filter    = (&(objectClass=mailDomain)(|(domainName=%s)(domainAliasName=%s))(accountStatus=active)(enabledService=mail))
+query_filter    = (&(objectClass=mailDomain)(accountStatus=active)(enabledService=mail)(!(domainBackupMX=yes))(|(domainName=%s)(domainAliasName=%s)))
 result_attribute= mtaTransport
 debuglevel      = 0
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.