summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2015-04-24 13:09:47 +0200
committerPetr Vobornik <pvoborni@redhat.com>2015-05-07 18:16:16 +0200
commit375eb7583334f231c27420c80b1b074e0cc554fe (patch)
treef5df25507bbe8b84cb0a90a190aedf40a01cf0d2
parent7d10547ae3098b96762846ff36e813042a503d59 (diff)
downloadfreeipa-375eb7583334f231c27420c80b1b074e0cc554fe.tar.gz
freeipa-375eb7583334f231c27420c80b1b074e0cc554fe.tar.xz
freeipa-375eb7583334f231c27420c80b1b074e0cc554fe.zip
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>
-rw-r--r--ipalib/plugins/user.py2
-rw-r--r--ipaserver/rpcserver.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index dea946e35..ab259cda3 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 2f771a0d1..5158c4212 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))