Branch 'pykolab-0.4' - 2 commits - configure.ac pykolab/setup

[Jeroen van Meeuwen]

 configure.ac               |    2 +-
 pykolab/setup/setup_mta.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ecbd3579e4980cec006a1cce1082f3230b152e64
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 14 15:36:17 2012 +0100

    Release 0.4.4

diff --git a/configure.ac b/configure.ac
index a2b8398..eb48360 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.4.3)
+AC_INIT([pykolab], 0.4.4)
 AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)


commit ff28764357e7514cdb955dd49f2b7039a92dea0d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 14 15:34:33 2012 +0100

    Correct the query_filter used in local recipient maps or postfix will always find a group it may conclude is therefore a valid recipient (#761)

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index f3d6d9b..36a5a25 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -62,7 +62,7 @@ domain = ldap:/etc/postfix/ldap/mydestination.cf
 bind_dn = %(service_bind_dn)s
 bind_pw = %(service_bind_pw)s
 
-query_filter = (|(&(|(mail=%%s)(alias=%%s))%(kolab_user_filter)s)%(kolab_group_filter)s)
+query_filter = (&(|(mail=%%s)(alias=%%s))(|%(kolab_user_filter)s%(kolab_group_filter)s))
 result_attribute = mail
 """ % {
                         "base_dn": conf.get('ldap', 'base_dn'),