summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-11-24 23:13:33 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-11-24 23:13:33 +0100
commit8f8236df2b81128a45185b3e4b91d24956e2a933 (patch)
tree2bdfeb20065458a95042c569148512b53585cf4e
parentdada49f8283803b8519c94e4feca4fdbff8acf85 (diff)
downloadpykolab-8f8236df2b81128a45185b3e4b91d24956e2a933.tar.gz
Make sure the input domain is the first in the storage order (#2585)
-rw-r--r--pykolab/setup/setup_ldap.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 2681160..66c5d41 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -587,6 +587,8 @@ ServerAdminPwd = %(admin_pass)s
# De-duplicate attribute values before attempting to insert the object (#2205)
attrs['associateddomain'] = list(set(attrs['associateddomain']))
+ attrs['associateddomain'].pop(attrs['associateddomain'].index(_input['domain']))
+ attrs['associateddomain'] = [ _input['domain'] ] + attrs['associateddomain']
attrs['aci'] = '(targetattr = "*") (version 3.0;acl "Read Access for %(domain)s Users";allow (read,compare,search)(userdn = "ldap:///%(rootdn)s??sub?(objectclass=*)");)' % (_input)