fix ITS#2923

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

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index ef6b8e4d56440946b7c3ff255878de79410a9acb..fb66fee3cc174156a7cf499630167c8d0c76fc41 100644 (file)
--- 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 ) {