diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-30 04:32:24 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | f7a4cceb97f829ad2e1f8853c0e4414dcebf731e (patch) | |
| tree | 8dde9241791e65990052b17882c5f429c6732e07 | |
| parent | 1ee66ffe03a0616c65215bc751a7ef6e674780ef (diff) | |
| download | freeipa-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
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 5 | ||||
| -rw-r--r-- | ipaserver/ipaldap.py | 6 |
3 files changed, 6 insertions, 9 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", diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index 7010ee5e3..e8a164064 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -1613,7 +1613,7 @@ class IPAdmin(LDAPClient): def do_simple_bind(self, binddn=DN(('cn', 'directory manager')), bindpw="", timeout=DEFAULT_TIMEOUT): - self.__bind_with_wait(self.simple_bind_s, timeout, binddn, bindpw) + self.__bind_with_wait(self.conn.simple_bind_s, timeout, binddn, bindpw) def do_sasl_gssapi_bind(self, timeout=DEFAULT_TIMEOUT): self.__bind_with_wait( @@ -1716,10 +1716,6 @@ class IPAdmin(LDAPClient): # FIXME: for backwards compatibility only return self.conn.encode(*args, **kwargs) - def simple_bind_s(self, *args, **kwargs): - # FIXME: for backwards compatibility only - return self.conn.simple_bind_s(*args, **kwargs) - def unbind(self, *args, **kwargs): # FIXME: for backwards compatibility only return self.conn.unbind(*args, **kwargs) |