Merge branch 'its7080' into 'master'

ITS#7080 And modrdns

See merge request !475

servers/slapd/bconfig.c

@@ -5814,7 +5814,7 @@ config_back_add( Operation *op, SlapReply *rs )
 		if ( slap_read_controls( op, rs, op->ora_e,
 			&slap_post_read_bv, postread_ctrl ) )
 		{
-			Debug( LDAP_DEBUG_ANY, "ldif_back_modify: "
+			Debug( LDAP_DEBUG_ANY, "config_back_add: "
 				"post-read failed \"%s\"\n",
 				op->ora_e->e_name.bv_val );
 			if ( op->o_postread & SLAP_CONTROL_CRITICAL ) {
@@ -6574,6 +6574,20 @@ config_back_modrdn( Operation *op, SlapReply *rs )
 		op->oq_modrdn = modr;
 	}
 
+	if ( rs->sr_err == LDAP_SUCCESS && !cfb->cb_use_ldif && op->o_postread ) {
+		if ( postread_ctrl == NULL ) {
+			postread_ctrl = &ctrls[num_ctrls++];
+			ctrls[num_ctrls] = NULL;
+		}
+		if ( slap_read_controls( op, rs, ce->ce_entry,
+			&slap_post_read_bv, postread_ctrl ) )
+		{
+			Debug( LDAP_DEBUG_ANY, "config_back_modrdn: "
+				"post-read failed \"%s\"\n",
+				ce->ce_entry->e_name.bv_val );
+		}
+	}
+
 	if ( dopause )
 		slap_unpause_server();
 out: