summaryrefslogtreecommitdiffstats
path: root/install/migration
diff options
context:
space:
mode:
authorTomas Krizek <tkrizek@redhat.com>2016-10-05 17:42:32 +0200
committerMartin Basti <mbasti@redhat.com>2016-11-07 11:34:03 +0100
commitde58a5c60596de8b45c8016c3318bac78305477a (patch)
tree80ea270b7dd694ab2ecd6404526e156858758260 /install/migration
parent5760b7e983da6bda8f5383d9079551e4acb4c2da (diff)
downloadfreeipa-de58a5c60596de8b45c8016c3318bac78305477a.tar.gz
freeipa-de58a5c60596de8b45c8016c3318bac78305477a.tar.xz
freeipa-de58a5c60596de8b45c8016c3318bac78305477a.zip
ipaldap: merge simple_bind into LDAPClient
* Use LDAPClient.simple_bind instead of extra call to IPAdmin.do_simple_bind * Rename binddn to bind_dn * Rename bindpw to bind_password * Explicitly specify bind_dn in all calls https://fedorahosted.org/freeipa/ticket/6461 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'install/migration')
-rw-r--r--install/migration/migration.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/install/migration/migration.py b/install/migration/migration.py
index 1d5e30704..a87b488fc 100644
--- a/install/migration/migration.py
+++ b/install/migration/migration.py
@@ -49,7 +49,7 @@ def bind(ldap_uri, base_dn, username, password):
bind_dn = DN(('uid', username), ('cn', 'users'), ('cn', 'accounts'), base_dn)
try:
conn = IPAdmin(ldap_uri=ldap_uri)
- conn.do_simple_bind(bind_dn, password)
+ conn.simple_bind(bind_dn, password)
except (errors.ACIError, errors.DatabaseError, errors.NotFound) as e:
root_logger.error(
'migration invalid credentials for %s: %s' % (bind_dn, e))