From f7a4cceb97f829ad2e1f8853c0e4414dcebf731e Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 30 Jan 2013 04:32:24 -0500 Subject: Remove IPAdmin.simple_bind_s Part of the work for: https://fedorahosted.org/freeipa/ticket/2660 --- ipaserver/install/dsinstance.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ipaserver/install/dsinstance.py') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 272e0af7..77d76a63 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", -- cgit