summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-12-10 11:41:17 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-01-10 14:41:39 +0100
commit21fab665f482445ebcdcedffad7182acdb02fa28 (patch)
tree6a12a0d9bfe90216c6254af9d3617db9009fb038 /ipaserver
parent8d67acc02609415aacd2cb16979443d9edc0ee22 (diff)
downloadfreeipa-21fab665f482445ebcdcedffad7182acdb02fa28.tar.gz
freeipa-21fab665f482445ebcdcedffad7182acdb02fa28.tar.xz
freeipa-21fab665f482445ebcdcedffad7182acdb02fa28.zip
Use LDAPClient.update_entry for LDAP mods in ldapupdate.
Remove legacy IPAdmin methods generateModList and updateEntry. https://fedorahosted.org/freeipa/ticket/3488
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/ldapupdate.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 0c44a85ab..97d7a355f 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -722,7 +722,7 @@ class LDAPUpdate:
else:
# Update LDAP
try:
- changes = self.conn.generateModList(entry.orig_data, entry)
+ changes = self.conn._generate_modlist(entry.dn, entry)
if len(changes) >= 1:
updated = True
safe_changes = []
@@ -731,7 +731,7 @@ class LDAPUpdate:
self.debug("%s" % safe_changes)
self.debug("Live %d, updated %d" % (self.live_run, updated))
if self.live_run and updated:
- self.conn.updateEntry(entry.dn, entry.orig_data, entry)
+ self.conn.update_entry(entry)
self.info("Done")
except errors.EmptyModlist:
self.info("Entry already up-to-date")