From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Fri, 3 Jan 2020 10:51:28 +0000 (+0000)
Subject: ITS#9145 Do not add controls to cancel/abandon
X-Git-Tag: OPENLDAP_REL_ENG_2_4_49~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4c24d7bea48f99cfb5ba0d44820ae35ad29549;p=thirdparty%2Fopenldap.git

ITS#9145 Do not add controls to cancel/abandon
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 0d9d7a6ac7..6361ebdb23 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1877,16 +1877,17 @@ int
 tool_check_abandon( LDAP *ld, int msgid )
 {
 	int	rc;
+	LDAPControl sctrls[1] = { NULL };
 
 	switch ( gotintr ) {
 	case Intr_Cancel:
-		rc = ldap_cancel_s( ld, msgid, NULL, NULL );
+		rc = ldap_cancel_s( ld, msgid, sctrls, NULL );
 		fprintf( stderr, "got interrupt, cancel got %d: %s\n",
 				rc, ldap_err2string( rc ) );
 		return -1;
 
 	case Intr_Abandon:
-		rc = ldap_abandon_ext( ld, msgid, NULL, NULL );
+		rc = ldap_abandon_ext( ld, msgid, sctrls, NULL );
 		fprintf( stderr, "got interrupt, abandon got %d: %s\n",
 				rc, ldap_err2string( rc ) );
 		return -1;