40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From a2a51130b2f95316237b85da099a8be734969e54 Mon Sep 17 00:00:00 2001
|
|
From: James Chapman <jachapma@redhat.com>
|
|
Date: Sat, 24 Apr 2021 21:37:54 +0100
|
|
Subject: [PATCH] Issue 4734 - import of entry with no parent warning (#4735)
|
|
|
|
Description: Online import of ldif file that contains an entry with
|
|
no parent doesnt generate a task warning.
|
|
|
|
Fixes: https://github.com/389ds/389-ds-base/issues/4734
|
|
|
|
Author: vashirov@redhat.com (Thanks)
|
|
|
|
Reviewed by: mreynolds, jchapma
|
|
---
|
|
ldap/servers/slapd/back-ldbm/db-bdb/bdb_import_threads.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_import_threads.c b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_import_threads.c
|
|
index 905a84e74..35183ed59 100644
|
|
--- a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_import_threads.c
|
|
+++ b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_import_threads.c
|
|
@@ -2767,8 +2767,14 @@ import_foreman(void *param)
|
|
if (job->flags & FLAG_ABORT) {
|
|
goto error;
|
|
}
|
|
+
|
|
+ /* capture skipped entry warnings for this task */
|
|
+ if((job) && (job->skipped)) {
|
|
+ slapi_task_set_warning(job->task, WARN_SKIPPED_IMPORT_ENTRY);
|
|
+ }
|
|
}
|
|
|
|
+
|
|
slapi_pblock_destroy(pb);
|
|
info->state = FINISHED;
|
|
return;
|
|
--
|
|
2.31.1
|
|
|