diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-03-28 14:47:53 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-03-28 14:47:53 -0400 |
commit | 034d9d6753c22db6fb38a9cf85f550a0b376ca9f (patch) | |
tree | 36170967063905347ef24dffbbfa78fc8b723203 /ipa-server/xmlrpc-server | |
parent | b387570fe6ed46e9eb9223a1c930ac060421f7b0 (diff) | |
download | freeipa-034d9d6753c22db6fb38a9cf85f550a0b376ca9f.tar.gz freeipa-034d9d6753c22db6fb38a9cf85f550a0b376ca9f.tar.xz freeipa-034d9d6753c22db6fb38a9cf85f550a0b376ca9f.zip |
Do case-less comparisons when considering objectclass but store the
current value to prevent unnecessary LPAP updates (and failed writes)
Don't check against these lists on updates, only add them on new entries.
Disable the ability to configure in the UI these values for now.
438256
Diffstat (limited to 'ipa-server/xmlrpc-server')
-rw-r--r-- | ipa-server/xmlrpc-server/funcs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index 879ff6bee..11b4e9fb5 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -998,7 +998,7 @@ class IPAServer: config = self.get_ipa_config(opts) # Make sure we have the latest object classes - newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipauserobjectclasses')) + # newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipauserobjectclasses')) try: rv = self.update_entry(oldentry, newentry, opts) @@ -1628,7 +1628,7 @@ class IPAServer: config = self.get_ipa_config(opts) # Make sure we have the latest object classes - newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipagroupobjectclasses')) + # newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipagroupobjectclasses')) try: rv = self.update_entry(oldentry, newentry, opts) @@ -2136,4 +2136,4 @@ def ldap_search_escape(match): def uniq_list(x): """Return a unique list, preserving order and ignoring case""" set = {} - return [set.setdefault(e.lower(),e.lower()) for e in x if e.lower() not in set] + return [set.setdefault(e.lower(),e) for e in x if e.lower() not in set] |