import pretty DN propagation fix (ITS#4456)

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 411a410303cbd708ba0f9c8f294fb0f3d90921aa..8d31acabb898265d20096740c7c26f5f22eadd51 100644 (file)
--- 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 54f6b1d9958fa80bc79a234751cf9e2a583f0017..e0f7c67905935758f3ac5af59ac23d509bb21f98 100644 (file)
--- 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 568a62c1978e7bf14378ab6ecde45a7d4bf47ddd..6b75ef74f7ab2c5a6584f5d157281ed22b607502 100644 (file)
--- 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 bcfa61cadce58f6ccf4d664e22e753e995004288..1ea94a0ba8e445d4b593d6f118df97ef7b0e3cb6 100644 (file)
--- 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 e76e2cdf32819e08b042534eecb49752e7262ccd..3cc9c97d83f57c58e05d59eb60f2228ac1ddecff 100644 (file)
--- 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,