Branch 'pykolab-0.5' - 2 commits - pykolab/imap pykolab/setup

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed Dec 19 14:21:52 CET 2012


 pykolab/imap/cyrus.py       |    4 ++--
 pykolab/setup/setup_ldap.py |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 481f8a17dfc69de4c50bd6eb3013a324481401b2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Dec 19 14:20:42 2012 +0100

    Retrieve the /shared/vendor/cyrus-imapd/server annotation

diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
index bc2a13e..079c4dc 100644
--- a/pykolab/imap/cyrus.py
+++ b/pykolab/imap/cyrus.py
@@ -179,14 +179,14 @@ class Cyrus(cyruslib.CYRUS):
 
             if max_tries <= num_try:
                 log.error(_("Could not get the annotations after %s tries.") % (num_try))
-                annotations = { mailfolder: { '/vendor/cmu/cyrus-imapd/server': self.server }}
+                annotations = { mailfolder: { '/shared/vendor/cmu/cyrus-imapd/server': self.server }}
                 break
 
             log.warning(_("No annotations for %s: %r") % (mailfolder,annotations))
 
             time.sleep(1)
 
-        server = annotations[mailfolder]['/vendor/cmu/cyrus-imapd/server']
+        server = annotations[mailfolder]['/shared/vendor/cmu/cyrus-imapd/server']
         self.mbox[mailfolder] = server
 
         log.debug(_("Server for INBOX folder %s is %s") % (mailfolder,server), level=8)


commit 6d13a81036557b0f02417f982b3879bd88c51602
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Dec 17 13:18:46 2012 +0000

    Add objectclass inetdomain for custom inetdomainbasedn attribute (#1473)

diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 325cbcf..23aaf6c 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -480,6 +480,7 @@ ServerAdminPwd = %(admin_pass)s
     # Add inetdomainbasedn in case the configured root dn is not the same as the
     # standard root dn for the domain name configured
     if not _input['rootdn'] == utils.standard_root_dn(_input['domain']):
+        attrs['objectclass'].append('inetdomain')
         attrs['inetdomainbasedn'] = _input['rootdn']
 
     ldif = ldap.modlist.addModlist(attrs)





More information about the commits mailing list