3 commits - bin/kolab_smtp_access_policy.py configure.ac pykolab/setup

[Jeroen van Meeuwen]

 bin/kolab_smtp_access_policy.py |    2 +-
 configure.ac                    |    2 +-
 pykolab/setup/setup_ldap.py     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b5d02f2d5938e6b9793519989d221ed1a0f8512b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Sep 26 00:24:31 2013 +0200

    Fix testing local but not the sender's domain

diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py
index 473c0a0..9db2c2a 100755
--- a/bin/kolab_smtp_access_policy.py
+++ b/bin/kolab_smtp_access_policy.py
@@ -799,7 +799,7 @@ class PolicyRequest(object):
             self.auth = Auth(sasl_domain)
 
         if verify_domain(sasl_domain):
-            if self.auth.domains.has_key(sasl_domain):
+            if not self.auth.domains == None and self.auth.domains.has_key(sasl_domain):
                 log.debug(
                         _("Using authentication domain %s instead of %s") % (
                                 self.auth.domains[sasl_domain],


commit 9c73eae931a7c35431b7dbee96d2265aac3bd46e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Sep 25 13:36:09 2013 +0200

    Release 0.6.7

diff --git a/configure.ac b/configure.ac
index a8ad488..130b9d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.6.6)
+AC_INIT([pykolab], 0.6.7)
 AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)


commit e7899de3e594373e77af900f3c82eee86e562dcc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Sep 24 13:54:49 2013 +0200

    Write out the correct data to the log files

diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index f6576f1..b0f40c0 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -365,7 +365,7 @@ ServerAdminPwd = %(admin_pass)s
         fp.close()
 
         fp = open('/var/log/kolab/setup.out.log', 'w')
-        fp.write(stderrdata)
+        fp.write(stdoutdata)
         fp.close()
 
     log.debug(_("Setup DS stdout:"), level=8)