Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / back-ldap / delete.c

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index be3053b59ea1c5b887870ba7a228d0499c3d9dad..06e39f51d5a96d8569ca5d231bd8f41980a01b2e 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -53,7 +53,6 @@ retry:
        rc = ldap_back_controls_add( op, rs, lc, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
-               rc = rs->sr_err;
                goto cleanup;
        }
 
@@ -82,5 +81,5 @@ cleanup:
                ldap_back_release_conn( li, lc );
        }
 
-       return rc;
+       return rs->sr_err;
 }