fix ITS#2923

diff --git a/CHANGES b/CHANGES
index 5f97f57a33982a3b5045776cd8c1da0074e63470..f64382942949664f8afd8835d2e441f0aa58e3c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.1.26 Engineering
        Updated lutil_passwd (ITS#2835, ITS#2869)
        Updated librewrite (ITS#2787)
        Updated slurpd (misc bug fixes)
+       Fixed back-ldap suffix massage when --enable-rewrite=no (ITS#2923)
 
 OpenLDAP 2.1.25 Engineering
        Build Environment

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index c392207b3a0f2ca242eb2ffd9d57f8373e1f20ad..51d6e8dcabee8c9042c81071dfab6a7d8f702b21 100644 (file)
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -57,9 +57,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;
        }
         if ( li == NULL || li->suffix_massage == NULL ) {
@@ -93,7 +93,7 @@ ldap_back_dn_massage(
                         /* XXX or an escaped separator... oh well */
                 }
 
-                if ( !strcmp( li->suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
+                if ( !strcasecmp( li->suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
                        res->bv_len = diff + li->suffix_massage[i+dst].bv_len;
                         res->bv_val = ch_malloc( res->bv_len + 1 );
                         strncpy( res->bv_val, dn->bv_val, diff );