From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 5 Apr 2006 23:53:25 +0000 (+0000)
Subject: import pretty DN propagation fix (ITS#4456)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_21~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f58ce16491c8fad124e6cf1438ecdf35b6a926c7;p=openldap

import pretty DN propagation fix (ITS#4456)
---

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 411a410303..8d31acabb8 100644
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -56,7 +56,7 @@ ldap_back_compare(
 	}
 
 retry:
-	rs->sr_err = ldap_compare_ext( lc->lc_ld, op->o_req_ndn.bv_val,
+	rs->sr_err = ldap_compare_ext( lc->lc_ld, op->o_req_dn.bv_val,
 			op->orc_ava->aa_desc->ad_cname.bv_val,
 			&op->orc_ava->aa_value, 
 			ctrls, NULL, &msgid );
diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 54f6b1d995..e0f7c67905 100644
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -59,7 +59,7 @@ ldap_back_delete(
 	}
 
 retry:
-	rs->sr_err = ldap_delete_ext( lc->lc_ld, op->o_req_ndn.bv_val,
+	rs->sr_err = ldap_delete_ext( lc->lc_ld, op->o_req_dn.bv_val,
 			ctrls, NULL, &msgid );
 	rc = ldap_back_op_result( lc, op, rs, msgid,
 		li->li_timeout[ LDAP_BACK_OP_DELETE], LDAP_BACK_SENDRESULT );
diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 568a62c197..6b75ef74f7 100644
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -107,7 +107,7 @@ ldap_back_modify(
 	}
 
 retry:
-	rs->sr_err = ldap_modify_ext( lc->lc_ld, op->o_req_ndn.bv_val, modv,
+	rs->sr_err = ldap_modify_ext( lc->lc_ld, op->o_req_dn.bv_val, modv,
 			ctrls, NULL, &msgid );
 	rc = ldap_back_op_result( lc, op, rs, msgid,
 		li->li_timeout[ LDAP_BACK_OP_MODIFY], LDAP_BACK_SENDRESULT );
diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index bcfa61cadc..1ea94a0ba8 100644
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -66,7 +66,7 @@ ldap_back_modrdn(
 	}
 
 retry:
-	rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_ndn.bv_val,
+	rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_dn.bv_val,
 			op->orr_newrdn.bv_val, newSup,
 			op->orr_deleteoldrdn, ctrls, NULL, &msgid );
 	rc = ldap_back_op_result( lc, op, rs, msgid,
diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index e76e2cdf32..3cc9c97d83 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -209,7 +209,7 @@ ldap_back_search(
 	/* deal with <draft-zeilenga-ldap-t-f> filters */
 	filter = op->ors_filterstr;
 retry:
-	rs->sr_err = ldap_search_ext( lc->lc_ld, op->o_req_ndn.bv_val,
+	rs->sr_err = ldap_search_ext( lc->lc_ld, op->o_req_dn.bv_val,
 			op->ors_scope, filter.bv_val,
 			attrs, op->ors_attrsonly, ctrls, NULL,
 			tv.tv_sec ? &tv : NULL,