summaryrefslogtreecommitdiffstats
path: root/ipaserver/install
diff options
context:
space:
mode:
Diffstat (limited to 'ipaserver/install')
-rw-r--r--ipaserver/install/cainstance.py4
-rw-r--r--ipaserver/install/dsinstance.py5
2 files changed, 5 insertions, 4 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 1f2dacc03..30f2b6bef 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -375,7 +375,7 @@ class CADSInstance(service.Service):
def enable_ssl(self):
conn = ipaldap.IPAdmin(self.fqdn, port=DEFAULT_DSPORT)
- 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",
@@ -1055,7 +1055,7 @@ class CAInstance(service.Service):
# the appropriate groups so it can issue certificates without
# manual intervention.
conn = ipaldap.IPAdmin(self.fqdn, self.ds_port)
- conn.simple_bind_s(DN(('cn', 'Directory Manager')), self.dm_password)
+ conn.do_simple_bind(DN(('cn', 'Directory Manager')), self.dm_password)
decoded = base64.b64decode(self.ra_cert)
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",