diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-12-10 11:45:10 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-01-10 14:41:39 +0100 |
| commit | 61887ac3929ac3bd5135867f31ad414a547327c9 (patch) | |
| tree | 564f5857eafdf8525705af0a5028460a1936fdf1 /ipaserver | |
| parent | 9d4bcb63dead51e927ac2a4b554ee0d98aed052f (diff) | |
| download | freeipa.git-61887ac3929ac3bd5135867f31ad414a547327c9.tar.gz freeipa.git-61887ac3929ac3bd5135867f31ad414a547327c9.tar.xz freeipa.git-61887ac3929ac3bd5135867f31ad414a547327c9.zip | |
Add LDAPEntry method generate_modlist.
Use LDAPEntry.generate_modlist instead of LDAPClient._generate_modlist and
remove LDAPClient._generate_modlist.
https://fedorahosted.org/freeipa/ticket/3488
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/schemaupdate.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 087cfcfd..42964c04 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -718,7 +718,7 @@ class LDAPUpdate: else: # Update LDAP try: - changes = self.conn._generate_modlist(entry.dn, entry) + changes = entry.generate_modlist() if len(changes) >= 1: updated = True safe_changes = [] diff --git a/ipaserver/install/schemaupdate.py b/ipaserver/install/schemaupdate.py index f51b29b7..bb2f0f16 100644 --- a/ipaserver/install/schemaupdate.py +++ b/ipaserver/install/schemaupdate.py @@ -114,7 +114,7 @@ def update_schema(schema_files, ldapi=False, dm_password=None, live_run=True): # FIXME: We should have a better way to display the modlist, # for now display raw output of our internal routine - modlist = conn._generate_modlist(schema_entry.dn, schema_entry) + modlist = schema_entry.generate_modlist() log.debug("Complete schema modlist:\n%s", pprint.pformat(modlist)) if modified and live_run: |