2 commits - pykolab/auth pykolab/conf

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun Feb 16 02:31:43 CET 2014


 pykolab/auth/ldap/__init__.py |    1 +
 pykolab/conf/__init__.py      |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7fd271c1869c79a2899cc7ac5ccc913033df3aa3
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Sun Feb 16 02:31:25 2014 +0100

    Added missing initialisation operations.

diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index 239c0dd..675944a 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -446,11 +446,15 @@ class Conf(object):
             setattr(self,option,self.cli_parser.defaults[option])
 
     def has_section(self, section):
-        self.read_config()
+        if not self.cfg_parser:
+            self.read_config()
 
         return self.cfg_parser.has_section(section)
 
     def has_option(self, section, option):
+        if not self.cfg_parser:
+            self.read_config()
+
         return self.cfg_parser.has_option(section, option)
 
     def get_list(self, section, key):


commit 56efaa5767732f5c3bb20458d14c6a7fb042ace9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Feb 16 02:27:19 2014 +0100

    Fix delivery_address_attribute not having been set

diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index ec7e9fe..c0c3297 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -1789,6 +1789,7 @@ class LDAP(pykolab.base.Base):
                     entry['kolabmailfolderaclentry']
                 )
 
+        delivery_address_attribute = self.config_get('sharedfolder_delivery_address_attribute')
         if entry.has_key(delivery_address_attribute) and \
                 not entry[delivery_address_attribute] == None:
             self.imap.set_acl(folder_path, 'anyone', '+p')




More information about the commits mailing list