diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2008-01-25 00:59:00 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2008-01-25 00:59:00 +0000 |
| commit | 0e365fd2ba59f54d46b94eb84a12d9c25b2bb560 (patch) | |
| tree | dba8798de71257a635235ff8bc0a2e30d7dfe5e9 /ldap/servers/slapd/bulk_import.c | |
| parent | 8ccabb1c7a14e377791c2d5be11540c8f54f4f89 (diff) | |
| download | ds-0e365fd2ba59f54d46b94eb84a12d9c25b2bb560.tar.gz ds-0e365fd2ba59f54d46b94eb84a12d9c25b2bb560.tar.xz ds-0e365fd2ba59f54d46b94eb84a12d9c25b2bb560.zip | |
Resolves: 429793
Summary: Fixed crash in replication during bulk import. Use bulk impport code more consistently.
Diffstat (limited to 'ldap/servers/slapd/bulk_import.c')
| -rw-r--r-- | ldap/servers/slapd/bulk_import.c | 7 |
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; |