diff options
author | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-31 10:59:26 -0700 |
---|---|---|
committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-31 10:59:26 -0700 |
commit | 00e299467c9d5c7b44724e45079bb0fdf7e5654b (patch) | |
tree | d03be9c47c4ad700d97df7e0d672ede262ba21a0 /ipa-server/ipaserver/ipaldap.py | |
parent | c85c8eede36224e72b42153708dd58a9f0610b0d (diff) | |
download | freeipa-00e299467c9d5c7b44724e45079bb0fdf7e5654b.tar.gz freeipa-00e299467c9d5c7b44724e45079bb0fdf7e5654b.tar.xz freeipa-00e299467c9d5c7b44724e45079bb0fdf7e5654b.zip |
Add account deactivation checkbox.
Fix genModList to lowercase all keys and use CIDict.
Diffstat (limited to 'ipa-server/ipaserver/ipaldap.py')
-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 4d0630eef..164509263 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, []) |