Merging my branch and d00ps branches to trunk

2010-01-22 07:43:29 +00:00
parent 8c55dd6c21
commit eeec43ebd7
119 changed files with 1137 additions and 1589 deletions
--- a/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and destination <> '' and destination <> ' '
+additional_conditions = and TRIM(destination) <> ''
 hosts = <SQL_HOST>