massage normalized DN when either is fine

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index f1ee000e27c009c6de2704ce203e782aef320393..3bed65a348d190458f09891434a491ee2eeaae9e 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -65,7 +65,7 @@ ldap_back_compare(
        dc.tofrom = 1;
        dc.normalized = 0;
 #endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
                send_ldap_result( op, rs );
                return -1;
        }
@@ -124,7 +124,7 @@ cleanup:
        }
 #endif /* LDAP_BACK_PROXY_AUTHZ */
        
-       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
                free( mdn.bv_val );
        }
        if ( freeval ) {

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 1487870b7299430e48d29bbfec4964d3b9b3cb11..0027f573844578978393072a11ef664f3036243d 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -65,7 +65,7 @@ ldap_back_delete(
        dc.tofrom = 1;
        dc.normalized = 0;
 #endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
                send_ldap_result( op, rs );
                return -1;
        }
@@ -93,7 +93,7 @@ cleanup:
        }
 #endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
                free( mdn.bv_val );
        }
 

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index a11321b5710b15ee504c01f15c523f720b33a680..541e41047da6726081328bef19218f6fdac4813d 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -68,7 +68,7 @@ ldap_back_modify(
        dc.tofrom = 1;
        dc.normalized = 0;
 #endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
                send_ldap_result( op, rs );
                return -1;
        }
@@ -182,7 +182,7 @@ cleanup:;
        }
 #endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
                free( mdn.bv_val );
        }
        for (i=0; modv[i]; i++) {

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index 6929c44039942f724fccb69cd9bcc2b345a5a404..13ab0ba7b028ce125b1e4e83177e680dfc1888ee 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -83,7 +83,7 @@ ldap_back_modrdn(
 #ifdef ENABLE_REWRITE
        dc.ctx = "modrDn";
 #endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
                send_ldap_result( op, rs );
                return -1;
        }
@@ -113,7 +113,7 @@ cleanup:
        }
 #endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
                free( mdn.bv_val );
        }
        if ( mnewSuperior.bv_val != NULL