improve fix to ITS#2923; note that suffix massaging is inherently flawed, because...

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index d666d3e87a947ff4c3ec0c38a04d04ec5c4db2d7..4dd6d8ccde5f8a9ca833d93a5f38a1480a10cb6d 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -144,7 +144,7 @@ ldap_back_search(
        dc.ctx = "searchBase";
 #else
        dc.tofrom = 1;
-       dc.normalized = 1;
+       dc.normalized = 0;
 #endif
        if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mbase ) ) {
                send_ldap_result( op, rs );

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index fb66fee3cc174156a7cf499630167c8d0c76fc41..2cee6844516cddb1541d74be2ee36511328276bb 100644 (file)
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -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 );