diff options
| author | Simo Sorce <ssorce@redhat.com> | 2007-09-04 15:40:24 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2007-09-04 15:40:24 -0400 |
| commit | 48e70a4bf03e18c305d4a29fd0e0f83b8596c36b (patch) | |
| tree | 9693db4f636a1a526db2dccae0d3a5c8dd90b4b1 /ipa-server/ipaserver | |
| parent | abeda55e34ff19d34bf48f7e8c7f1df42b86136f (diff) | |
| parent | 00e299467c9d5c7b44724e45079bb0fdf7e5654b (diff) | |
| download | freeipa.git-48e70a4bf03e18c305d4a29fd0e0f83b8596c36b.tar.gz freeipa.git-48e70a4bf03e18c305d4a29fd0e0f83b8596c36b.tar.xz freeipa.git-48e70a4bf03e18c305d4a29fd0e0f83b8596c36b.zip | |
Merge with upstream
Diffstat (limited to 'ipa-server/ipaserver')
| -rw-r--r-- | ipa-server/ipaserver/ipaldap.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ipa-server/ipaserver/ipaldap.py b/ipa-server/ipaserver/ipaldap.py index 4d0630ee..16450926 100644 --- a/ipa-server/ipaserver/ipaldap.py +++ b/ipa-server/ipaserver/ipaldap.py @@ -29,6 +29,7 @@ import urllib2 import socket import ldif import re +import string import ldap import cStringIO import time @@ -382,8 +383,11 @@ class IPAdmin(SimpleLDAPObject): REPLACE operations, to deal with multi-user updates more properly.""" modlist = [] - keys = set(old_entry.keys()) - keys.update(new_entry.keys()) + old_entry = ipautil.CIDict(old_entry) + new_entry = ipautil.CIDict(new_entry) + + keys = set(map(string.lower, old_entry.keys())) + keys.update(map(string.lower, new_entry.keys())) for key in keys: new_values = new_entry.get(key, []) |