andykimpe / rpms / 389-ds-base

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