pykolab/setup

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Oct 21 16:54:21 CEST 2013


 pykolab/setup/setup_ldap.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e2c80a7e6d6b90a4615347a4487dd7b9b0b113a6
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Mon Oct 21 16:53:41 2013 +0200

    Use the defaults when a schema error has occured, but our own Kolab defaults should no schema error have occured (#2300)

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");)')




More information about the commits mailing list