summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-05-16 18:07:44 +0000
committerGerrit Code Review <review@openstack.org>2023-05-16 18:07:44 +0000
commit74ea58e0b9d774f3a27719f6c4542e182794c055 (patch)
tree985d756c2aae2db598f96ea771fb30e349bbf780
parent1d58835d3e388363af9458bb4a145a9472a22e7b (diff)
parent42e2f985b246aa11de914bf5a8f0dc7f6836f501 (diff)
downloadkeystone-master.tar.gz
Merge "[PooledLDAPHandler] Clean up the fix for result3()"HEADmaster
-rw-r--r--keystone/identity/backends/ldap/common.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/keystone/identity/backends/ldap/common.py b/keystone/identity/backends/ldap/common.py
index 7a366ef01..a3b2b696f 100644
--- a/keystone/identity/backends/ldap/common.py
+++ b/keystone/identity/backends/ldap/common.py
@@ -872,10 +872,6 @@ class PooledLDAPHandler(LDAPHandler):
# ultimately renders the pool unusable, causing a DoS.
try:
results = message.connection.result3(message.id, all, timeout)
- except Exception:
- # We don't want to ignore thrown
- # exceptions, raise them
- raise
finally:
# Now that we have the results from the LDAP server for
# the message, we don't need the the context manager used