From 5c6ec10f48d5b29f7039218d97249b848b8a5424 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 6 Mar 2004 16:49:08 +0000
Subject: [PATCH] massage normalized DN when either is fine

---
 servers/slapd/back-ldap/compare.c | 4 ++--
 servers/slapd/back-ldap/delete.c  | 4 ++--
 servers/slapd/back-ldap/modify.c  | 4 ++--
 servers/slapd/back-ldap/modrdn.c  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index f1ee000e27..3bed65a348 100644
--- 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 1487870b72..0027f57384 100644
--- 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 a11321b571..541e41047d 100644
--- 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 6929c44039..13ab0ba7b0 100644
--- 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
-- 
2.39.5