summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd/bulk_import.c
diff options
context:
space:
mode:
Diffstat (limited to 'ldap/servers/slapd/bulk_import.c')
-rw-r--r--ldap/servers/slapd/bulk_import.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ldap/servers/slapd/bulk_import.c b/ldap/servers/slapd/bulk_import.c
index 5e158d36..717ff477 100644
--- a/ldap/servers/slapd/bulk_import.c
+++ b/ldap/servers/slapd/bulk_import.c
@@ -176,10 +176,11 @@ process_bulk_import_op (Slapi_PBlock *pb, int state, Slapi_Entry *e)
rc = be->be_wire_import (pb);
if (rc != 0)
{
- if (rc != LDAP_BUSY)
- slapi_log_error(SLAPI_LOG_FATAL, NULL, "slapi_start_bulk_import: "
+ /* The caller will free the entry (e), so we just
+ * leave it alone here. */
+ slapi_log_error(SLAPI_LOG_FATAL, NULL, "slapi_start_bulk_import: "
"failed; error = %d\n", rc);
- return (LDAP_BUSY == rc ? LDAP_BUSY : LDAP_OPERATIONS_ERROR);
+ return LDAP_OPERATIONS_ERROR;
}
return LDAP_SUCCESS;