2 commits - pykolab/cli pykolab/plugins ucs/kolab_sieve.py

[Jeroen van Meeuwen]

 pykolab/cli/sieve/cmd_refresh.py      |    4 ++--
 pykolab/plugins/sievemgmt/__init__.py |    4 ++--
 ucs/kolab_sieve.py                    |    1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 38c2bf2ba44e48d5297c6bdf052c1cdfc50bcb9b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Dec 14 12:29:59 2012 +0000

    Fix issuing len() on a possible None

diff --git a/pykolab/cli/sieve/cmd_refresh.py b/pykolab/cli/sieve/cmd_refresh.py
index 77eecc5..226fb93 100644
--- a/pykolab/cli/sieve/cmd_refresh.py
+++ b/pykolab/cli/sieve/cmd_refresh.py
@@ -258,7 +258,7 @@ def execute(*args, **kw):
         mgmt_script.require(required_extension)
 
     if vacation_active:
-        if len(vacation_react_domains) > 0:
+        if not vacation_react_domains == None and len(vacation_react_domains) > 0:
             mgmt_script.addfilter(
                     'vacation',
                     [('envelope', ':domain', ":is", "from", vacation_react_domains)],
@@ -275,7 +275,7 @@ def execute(*args, **kw):
                         ]
                 )
 
-        elif len(vacation_noreact_domains) > 0:
+        elif not vacation_noreact_domains == None and len(vacation_noreact_domains) > 0:
             mgmt_script.addfilter(
                     'vacation',
                     [('not', ('envelope', ':domain', ":is", "from", vacation_noreact_domains))],
diff --git a/pykolab/plugins/sievemgmt/__init__.py b/pykolab/plugins/sievemgmt/__init__.py
index f341eae..1e22a47 100644
--- a/pykolab/plugins/sievemgmt/__init__.py
+++ b/pykolab/plugins/sievemgmt/__init__.py
@@ -271,7 +271,7 @@ class KolabSievemgmt(object):
             mgmt_script.require(required_extension)
 
         if vacation_active:
-            if len(vacation_react_domains) > 0:
+            if not vacation_react_domains == None and len(vacation_react_domains) > 0:
                 mgmt_script.addfilter(
                         'vacation',
                         [('envelope', ':domain', ":is", "from", vacation_react_domains)],
@@ -288,7 +288,7 @@ class KolabSievemgmt(object):
                             ]
                     )
 
-            elif len(vacation_noreact_domains) > 0:
+            elif not vacation_noreact_domains == None and len(vacation_noreact_domains) > 0:
                 mgmt_script.addfilter(
                         'vacation',
                         [('not', ('envelope', ':domain', ":is", "from", vacation_noreact_domains))],


commit 1dd9c6570e4ef2b08523e8545d41c97830459624
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Dec 12 13:41:48 2012 +0000

    Make sure result_attr is obtained from our configuration before using the corresponding variable

diff --git a/ucs/kolab_sieve.py b/ucs/kolab_sieve.py
index b6d0349..f2b8df0 100755
--- a/ucs/kolab_sieve.py
+++ b/ucs/kolab_sieve.py
@@ -134,6 +134,7 @@ def handler(*args, **kw):
 
             # See if the mailserver_attribute exists
             mailserver_attribute = conf.get('ldap', 'mailserver_attribute').lower()
+            result_attr = conf.get('cyrus-sasl', 'result_attribute').lower()
 
             if mailserver_attribute == None:
                 log.error("Mail server attribute is not set")