From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 17 Jan 2004 12:29:05 +0000 (+0000)
Subject: fix ITS#2923
X-Git-Tag: OPENLDAP_REL_ENG_2_2_5~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73492621a0a94ee4cf83186edb2144da54f0afcc;p=openldap

fix ITS#2923
---

diff --git a/CHANGES b/CHANGES
index 9236f12c15..3c33bfd1d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.2 Change Log
 OpenLDAP 2.2.5 Engineering
 	Fix back-bdb syncrepl psearch add bug
 	Honour access denied return value from ACL plugins
+	Fix back-ldap suffix massage when --enable-rewrite=no (ITS#2923)
 
 OpenLDAP 2.2.4 Release
 	Initial release for "general" use.
diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index ef6b8e4d56..2cee684451 100644
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -97,9 +97,9 @@ ldap_back_dn_massage(
 
 	assert( res );
 
+	res->bv_val = NULL;
+	res->bv_len = 0;
 	if ( dn == NULL ) {
-		res->bv_val = NULL;
-		res->bv_len = 0;
 		return 0;
 	}
 	if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
@@ -135,7 +135,7 @@ ldap_back_dn_massage(
 			/* At a DN Separator */
 		}
 
-		if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
+		if ( !strcasecmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
 			res->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
 			res->bv_val = ch_malloc( res->bv_len + 1 );
 			strncpy( res->bv_val, dn->bv_val, diff );