summaryrefslogtreecommitdiffstats
path: root/pykolab
diff options
context:
space:
mode:
authorDaniel Hoffend <dh@dotlan.net>2013-10-21 16:53:41 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-10-21 16:53:41 +0200
commite2c80a7e6d6b90a4615347a4487dd7b9b0b113a6 (patch)
tree823802bde9fcfc4e99dc8595e82e2b81803fa451 /pykolab
parent82703985d2b3a1f0fcc1f54eb0347bb68c4ee296 (diff)
downloadpykolab-e2c80a7e6d6b90a4615347a4487dd7b9b0b113a6.tar.gz
Use the defaults when a schema error has occured, but our own Kolab defaults should no schema error have occured (#2300)
Diffstat (limited to 'pykolab')
-rw-r--r--pykolab/setup/setup_ldap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index d3d8bf4..9944403 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -646,7 +646,7 @@ ServerAdminPwd = %(admin_pass)s
dn = _input['rootdn']
aci = []
- if not schema_error:
+ if 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 || 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");)')