Branch 'pykolab-0.6' - 2 commits - configure.ac pykolab/auth

[Jeroen van Meeuwen]

 configure.ac                  |    2 +-
 pykolab/auth/ldap/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 578bd98584731e580e714e82fbebfc87e802b9fe
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jan 28 12:33:07 2014 +0100

    Only not apply the recipient policy in the daemon if the setting is explicitly false

diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 2f7d49c..8572fec 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -578,7 +578,7 @@ class LDAP(pykolab.base.Base):
             secondary_mail_attribute = mail_attributes[1]
 
         daemon_rcpt_policy = self.config_get('daemon_rcpt_policy')
-        if not utils.true_or_false(daemon_rcpt_policy) == False and not daemon_rcpt_policy == None:
+        if not utils.true_or_false(daemon_rcpt_policy) and not daemon_rcpt_policy == None:
             log.info(_("Applying recipient policy disabled through configuration"))
             return entry_modifications
 


commit 825d27ed826e042a100b4196d1db6f5a252b3e5f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jan 28 12:29:56 2014 +0100

    Release 0.6.11

diff --git a/configure.ac b/configure.ac
index f13c3b9..63f947b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.6.10)
+AC_INIT([pykolab], 0.6.11)
 AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)