From: Anton Bobrov <antbob@users.noreply.github.com>
Date: Thu, 4 Nov 2021 16:27:34 +0000 (+0100)
Subject: ITS#9737 ldapdelete unable to prune LDAP subentries
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=252a7dbbd002468adfd2d39a2f9563b1f098cf21;p=thirdparty%2Fopenldap.git

ITS#9737 ldapdelete unable to prune LDAP subentries
---

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index dbc85b0355..bac4ff9971 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -279,8 +279,13 @@ retry:;
 	}
 
 	rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, &ctrls, 1 );
+	if( rc != LDAP_SUCCESS ) {
+		fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
+			prog, ldap_err2string( rc ), rc );
+		return rc;
+	}
 
-	switch ( rc ) {
+	switch ( code ) {
 	case LDAP_SUCCESS:
 		break;
 
@@ -292,9 +297,7 @@ retry:;
 		/* fallthru */
 
 	default:
-		fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
-			prog, ldap_err2string( rc ), rc );
-		return rc;
+		break;
 	}
 
 	if( code != LDAP_SUCCESS ) {