Read config tree from back-ldif

[openldap] / servers / slapd / back-meta / modrdn.c

diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 7f8b604bb50a1e6e133df3c97c7f9c8e76ed054c..a0d7e408ccd443925aa01126eb17465e8dc9f864 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -43,20 +43,21 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
        dncookie                dc;
 
        lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,
-                       &op->o_req_ndn, &candidate );
+                       &op->o_req_ndn, &candidate, LDAP_BACK_SENDERR );
        if ( !lc ) {
-               rc = -1;
-               goto cleanup;
+               return rs->sr_err;
        }
 
        assert( candidate != META_TARGET_NONE );
 
-       if ( !meta_back_dobind( lc, op ) 
-                       || !meta_back_is_valid( lc, candidate ) )
-       {
+       if ( !meta_back_dobind( lc, op, LDAP_BACK_SENDERR ) ) {
+               return rs->sr_err;
+       }
+               
+       if ( !meta_back_is_valid( lc, candidate ) ) {
                rs->sr_err = LDAP_OTHER;
-               rc = -1;
-               goto cleanup;
+               send_ldap_result( op, rs );
+               return rs->sr_err;
        }
 
        dc.conn = op->o_conn;
@@ -115,7 +116,7 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
                        op->orr_newrdn.bv_val,
                        mnewSuperior.bv_val,
                        op->orr_deleteoldrdn,
-                       NULL, NULL ) != LDAP_SUCCESS;
+                       op->o_ctrls, NULL ) != LDAP_SUCCESS;
 
 cleanup:;
        if ( mdn.bv_val != op->o_req_dn.bv_val ) {