Happy New Year!

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

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index d0c7af608d1b1568554c7a51911c23a5af37dc6a..523f547a04ce7d43451d65985400d3c67a8e4626 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2014 The OpenLDAP Foundation.
+ * Copyright 2003-2016 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -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;
 }