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 /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 'install')
| -rwxr-xr-x | install/tools/ipa-csreplica-manage | 4 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-install | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index bb557f485..c088bba1a 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -224,7 +224,7 @@ def list_replicas(realm, host, replica, dirman_passwd, verbose): except Exception, e: sys.exit("Failed to get data from '%s' while trying to list replicas: %s" % (host, convert_error(e))) finally: - conn.unbind_s() + conn.unbind() if not replica: for k, p in peers.iteritems(): @@ -395,7 +395,7 @@ def add_link(realm, replica1, replica2, dirman_passwd, options): dn = DN(('cn', 'CA'), ('cn', replica2), ('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), ipautil.realm_to_suffix(realm)) conn.get_entries(dn, ldap.SCOPE_ONELEVEL) - conn.unbind_s() + conn.unbind() except errors.NotFound: sys.exit('%s does not have a CA configured.' % replica2) except errors.NetworkError, e: diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index b09cbca43..13c32607a 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -616,7 +616,7 @@ def main(): if conn and conn.isconnected(): conn.disconnect() if replman and replman.conn: - replman.conn.unbind_s() + replman.conn.unbind() if options.skip_schema_check: root_logger.info("Skipping CA DS schema check") |