From: Howard Chu <hyc@openldap.org>
Date: Mon, 19 Oct 2020 13:03:41 +0000 (+0100)
Subject: [PATCH] ITS#9370 check for equality rule on old_rdn
X-Git-Tag: archive/raspbian/2.4.47+dfsg-3+rpi1+deb10u7^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce5dcae11e4afa8e8a945d1269b989cf42abc7c2;p=openldap.git

[PATCH] ITS#9370 check for equality rule on old_rdn

Just skip normalization if there's no equality rule. We accept
DNs without equality rules already.

Gbp-Pq: Name ITS-9370-check-for-equality-rule-on-old_rdn.patch
---

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index e594187d..51b6062b 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -505,7 +505,7 @@ slap_modrdn2mods(
 			mod_tmp->sml_values = ( BerVarray )ch_malloc( 2 * sizeof( struct berval ) );
 			ber_dupbv( &mod_tmp->sml_values[0], &old_rdn[d_cnt]->la_value );
 			mod_tmp->sml_values[1].bv_val = NULL;
-			if( desc->ad_type->sat_equality->smr_normalize) {
+			if( desc->ad_type->sat_equality && desc->ad_type->sat_equality->smr_normalize) {
 				mod_tmp->sml_nvalues = ( BerVarray )ch_malloc( 2 * sizeof( struct berval ) );
 				(void) (*desc->ad_type->sat_equality->smr_normalize)(
 					SLAP_MR_EQUALITY|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,