From: Volker Lendecke <vl@samba.org>
Date: Mon, 17 Aug 2020 19:59:48 +0000 (+0200)
Subject: tldap: Always remove ourselves from ld->pending at cleanup time
X-Git-Tag: samba-4.11.14~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc2ac271d1eab79f9716f8c685dd7f67ecb40d8;p=thirdparty%2Fsamba.git

tldap: Always remove ourselves from ld->pending at cleanup time

Bug: https://bugzilla.samba.org/show_bug.cgi?id=14465

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 14f6d1996ec38620b1c05a3b6c0e26dd21801fac)
---

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 9274db126c4..09f8446677d 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -529,14 +529,7 @@ static void tldap_msg_unset_pending(struct tevent_req *req)
 static void tldap_msg_cleanup(struct tevent_req *req,
 			      enum tevent_req_state req_state)
 {
-	switch (req_state) {
-	case TEVENT_REQ_USER_ERROR:
-	case TEVENT_REQ_RECEIVED:
-		tldap_msg_unset_pending(req);
-		return;
-	default:
-		return;
-	}
+	tldap_msg_unset_pending(req);
 }
 
 static bool tldap_msg_set_pending(struct tevent_req *req)