2 commits - pykolab/auth pykolab/setup

[Jeroen van Meeuwen]

 pykolab/auth/__init__.py      |    4 ++--
 pykolab/auth/ldap/__init__.py |    6 +++---
 pykolab/setup/setup_ldap.py   |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9290bf4447225bece69eda94e15bc3740832f6e9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 20 12:23:54 2013 +0200

    Avoid case-sensitive comparisons of otherwise case-insensitive matters (#1003587)

diff --git a/pykolab/auth/__init__.py b/pykolab/auth/__init__.py
index 5c6d51c..04c286d 100644
--- a/pykolab/auth/__init__.py
+++ b/pykolab/auth/__init__.py
@@ -241,9 +241,9 @@ class Auth(pykolab.base.Base):
             else:
                 self.domains = {}
                 for primary, secondaries in domains:
-                    self.domains[primary] = primary
+                    self.domains[primary.lower()] = primary.lower()
                     for secondary in secondaries:
-                        self.domains[secondary] = primary
+                        self.domains[secondary.lower()] = primary.lower()
 
         return self.domains
 
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 6670d17..f597dfd 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -2099,10 +2099,10 @@ class LDAP(pykolab.base.Base):
 
             # TODO: Where we use associateddomain is actually configurable
             if type(domain_attrs[dna]) == list:
-                primary_domain = domain_attrs[dna].pop(0)
-                secondary_domains = domain_attrs[dna]
+                primary_domain = domain_attrs[dna].pop(0).lower()
+                secondary_domains = [x.lower() for x in domain_attrs[dna]]
             else:
-                primary_domain = domain_attrs[dna]
+                primary_domain = domain_attrs[dna].lower()
 
             domains.append((primary_domain,secondary_domains))
 


commit bb8862cd3044b1cad18fea869de8fd62ed70007c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Oct 19 10:39:44 2013 +0200

    Users themselves are not allowed to modify kolabAllowSMTPRecipient - this tends to be a mandatory policy

diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index b0f40c0..d3d8bf4 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -649,7 +649,7 @@ ServerAdminPwd = %(admin_pass)s
     if not schema_error:
         aci.append('(targetattr = "homePhone || preferredDeliveryMethod || jpegPhoto || postalAddress || carLicense || userPassword || mobile || displayName || description || labeledURI || homePostalAddress || postOfficeBox || registeredAddress || postalCode || photo || title || street || pager || o || l || initials || telephoneNumber || preferredLanguage || facsimileTelephoneNumber") (version 3.0;acl "Enable self write for common attributes";allow (read,compare,search,write)(userdn = "ldap:///self");)')
     else:
-        aci.append('(targetattr = "homePhone || preferredDeliveryMethod || jpegPhoto || postalAddress || carLicense || userPassword || mobile || kolabAllowSMTPRecipient || displayName || kolabDelegate || description || labeledURI || homePostalAddress || postOfficeBox || registeredAddress || postalCode || photo || title || street || kolabInvitationPolicy || pager || o || l || initials || kolabAllowSMTPSender || telephoneNumber || preferredLanguage || facsimileTelephoneNumber") (version 3.0;acl "Enable self write for common attributes";allow (read,compare,search,write)(userdn = "ldap:///self");)')
+        aci.append('(targetattr = "homePhone || preferredDeliveryMethod || jpegPhoto || postalAddress || carLicense || userPassword || mobile || displayName || kolabDelegate || description || labeledURI || homePostalAddress || postOfficeBox || registeredAddress || postalCode || photo || title || street || kolabInvitationPolicy || pager || o || l || initials || kolabAllowSMTPSender || telephoneNumber || preferredLanguage || facsimileTelephoneNumber") (version 3.0;acl "Enable self write for common attributes";allow (read,compare,search,write)(userdn = "ldap:///self");)')
 
     aci.append('(targetattr = "*") (version 3.0;acl "Directory Administrators Group";allow (all)(groupdn = "ldap:///cn=Directory Administrators,%(rootdn)s" or roledn = "ldap:///cn=kolab-admin,%(rootdn)s");)' % (_input))
     aci.append('(targetattr="*")(version 3.0; acl "Configuration Administrators Group"; allow (all) groupdn="ldap:///cn=Configuration Administrators,ou=Groups,ou=TopologyManagement,o=NetscapeRoot";)')