summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/dsinstance.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-30 04:32:24 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-01 16:59:46 +0100
commitf7a4cceb97f829ad2e1f8853c0e4414dcebf731e (patch)
tree8dde9241791e65990052b17882c5f429c6732e07 /ipaserver/install/dsinstance.py
parent1ee66ffe03a0616c65215bc751a7ef6e674780ef (diff)
downloadfreeipa-f7a4cceb97f829ad2e1f8853c0e4414dcebf731e.tar.gz
freeipa-f7a4cceb97f829ad2e1f8853c0e4414dcebf731e.tar.xz
freeipa-f7a4cceb97f829ad2e1f8853c0e4414dcebf731e.zip
Remove IPAdmin.simple_bind_s
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r--ipaserver/install/dsinstance.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 272e0af72..77d76a635 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -463,7 +463,8 @@ class DsInstance(service.Service):
root_logger.debug("Waiting for memberof task to complete.")
conn = ipaldap.IPAdmin(self.fqdn)
if self.dm_password:
- conn.simple_bind_s(DN(('cn', 'directory manager')), self.dm_password)
+ conn.do_simple_bind(
+ DN(('cn', 'directory manager')), self.dm_password)
else:
conn.do_sasl_gssapi_bind()
replication.wait_for_task(conn, dn)
@@ -557,7 +558,7 @@ class DsInstance(service.Service):
dsdb.create_pin_file()
conn = ipaldap.IPAdmin(self.fqdn)
- conn.simple_bind_s(DN(('cn', 'directory manager')), self.dm_password)
+ conn.do_simple_bind(DN(('cn', 'directory manager')), self.dm_password)
mod = [(ldap.MOD_REPLACE, "nsSSLClientAuth", "allowed"),
(ldap.MOD_REPLACE, "nsSSL3Ciphers",