summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/cainstance.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/cainstance.py
parent1ee66ffe03a0616c65215bc751a7ef6e674780ef (diff)
downloadfreeipa.git-f7a4cceb97f829ad2e1f8853c0e4414dcebf731e.tar.gz
freeipa.git-f7a4cceb97f829ad2e1f8853c0e4414dcebf731e.tar.xz
freeipa.git-f7a4cceb97f829ad2e1f8853c0e4414dcebf731e.zip
Remove IPAdmin.simple_bind_s
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/cainstance.py')
-rw-r--r--ipaserver/install/cainstance.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 1f2dacc0..30f2b6be 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)