summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-02-11 16:26:58 +0100
committerMartin Kosek <mkosek@redhat.com>2013-10-31 18:09:51 +0100
commit463407ac6fb683b85866e39080cebe47b8c89fbc (patch)
treecf7165a0579c313dc319a73335e7786a1600984d /ipapython
parent9ecf4b7aac0adbe23e166a42ac8ce0f24f4a13f6 (diff)
downloadfreeipa-463407ac6fb683b85866e39080cebe47b8c89fbc.tar.gz
freeipa-463407ac6fb683b85866e39080cebe47b8c89fbc.tar.xz
freeipa-463407ac6fb683b85866e39080cebe47b8c89fbc.zip
Make sure attributeTypes updates are done before objectClasses updates.
https://fedorahosted.org/freeipa/ticket/3521
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipaldap.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 6d2989104..4a128e998 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -2009,7 +2009,10 @@ class IPAdmin(LDAPClient):
# replace any existing schema.
if old_entry.get('dn', DN()) == DN(('cn', 'schema')):
if len(adds) > 0:
- modlist.append((ldap.MOD_ADD, key, adds))
+ if key == 'attributetypes':
+ modlist.insert(0, (ldap.MOD_ADD, key, adds))
+ else:
+ modlist.append((ldap.MOD_ADD, key, adds))
else:
if adds:
if force_replace: