CHANGES

@@ -2,6 +2,7 @@ OpenLDAP 2.6 Change Log
 
 OpenLDAP 2.6.2 Engineering
 	Added slapd support for OpenSSL 3.0 (ITS#9436)
+	Fixed ldapdelete to prune LDAP subentries (ITS#9737)
 	Fixed libldap to drop connection when non-LDAP data is received (ITS#9803)
 	Fixed slapd slaptest conversion of olcLastBind (ITS#9808)
 	Fixed slapd to correctly init global_host earlier (ITS#9787)

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 ) {