From 375eb7583334f231c27420c80b1b074e0cc554fe Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: May 07 2015 16:16:16 +0000
Subject: use Connectible.disconnect() instead of .destroy_connection()


Destroy connection is an internal function of Connectible and therefore
it should not be used directly.

https://fedorahosted.org/freeipa/ticket/4991

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>

---

diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index dea946e..ab259cd 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -852,7 +852,7 @@ class user_status(LDAPQuery):
                 count += 1
 
             if host != api.env.host:
-                other_ldap.destroy_connection()
+                other_ldap.disconnect()
 
         return dict(result=entries,
                     count=count,
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 2f771a0..5158c42 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -1077,7 +1077,7 @@ class change_password(Backend, HTTP_Status):
                 message = "Password was changed."
             finally:
                 if conn.isconnected():
-                    conn.destroy_connection()
+                    conn.disconnect()
 
         self.info('%s: %s', status, message)
 
@@ -1182,7 +1182,7 @@ class sync_token(Backend, HTTP_Status):
                        data['user'], str(e))
         finally:
             if conn.isconnected():
-                conn.destroy_connection()
+                conn.disconnect()
 
         # Report status and return.
         response_headers.append(('X-IPA-TokenSync-Result', result))