diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-30 06:46:48 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | 334a0cdcdc16ac50de2be1f751262bd87d0e5e86 (patch) | |
| tree | 80882ce2180354b9c2f4520791381ac9d226f027 /ipaserver/install | |
| parent | f7a4cceb97f829ad2e1f8853c0e4414dcebf731e (diff) | |
| download | freeipa-334a0cdcdc16ac50de2be1f751262bd87d0e5e86.tar.gz freeipa-334a0cdcdc16ac50de2be1f751262bd87d0e5e86.tar.xz freeipa-334a0cdcdc16ac50de2be1f751262bd87d0e5e86.zip | |
Remove IPAdmin.unbind_s(), keep unbind()
The unbind and unbind_s functions do the same thing (both are synchronous).
In the low-level IPASimpleLDAPObject, unbind_s rather than unbind is kept.
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/cainstance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 9c9ad6489..dff661dd6 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -190,7 +190,7 @@ def dns_container_exists(fqdn, suffix, dm_password=None, ldapi=False, realm=None raise RuntimeError('LDAP server on %s is not responding. Is IPA installed?' % fqdn) ret = object_exists(DN(('cn', 'dns'), suffix)) - conn.unbind_s() + conn.unbind() return ret diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 30f2b6bef..256479875 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1084,7 +1084,7 @@ class CAInstance(service.Service): modlist = [(0, 'uniqueMember', '%s' % entry_dn)] conn.modify_s(dn, modlist) - conn.unbind_s() + conn.unbind() def __run_certutil(self, args, database=None, pwd_file=None,stdin=None): if not database: |