fix(controls): make sure msg_id is not undefined in error case

spaceone · droideck · commit 8a6586241e59 · 2025-10-10T12:55:03.000-07:00
diff --git a/Lib/ldap/controls/openldap.py b/Lib/ldap/controls/openldap.py
@@ -51,6 +51,7 @@ class SearchNoOpMixIn:
   """
 
   def noop_search_st(self,base,scope=ldap.SCOPE_SUBTREE,filterstr='(objectClass=*)',timeout=-1):
+    msg_id = None
     try:
       msg_id = self.search_ext(
         base,
@@ -66,9 +67,10 @@ def noop_search_st(self,base,scope=ldap.SCOPE_SUBTREE,filterstr='(objectClass=*)
       ldap.TIMELIMIT_EXCEEDED,
       ldap.SIZELIMIT_EXCEEDED,
       ldap.ADMINLIMIT_EXCEEDED
-    ) as e:
-      self.abandon(msg_id)
-      raise e
+    ):
+      if msg_id is not None:
+        self.abandon(msg_id)
+      raise
     else:
       noop_srch_ctrl = [
         c
