ldap/admin/src/scripts/DSUtil.pm.in | 2 +-
ldap/servers/slapd/back-ldbm/import.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8ab4be536a39569cf2c74672aa73848b94b10503
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Dec 19 12:26:59 2016 -0500
Ticket 49071 - Import with duplicate DNs throws unexpected errors
Bug Description: When an import fails there are unable to flush error
messages.
Fix Description: When an import fails close the database files before
deleting them.
Also fixed a small issue in DSUtil where we did not properly
check if an entry was valid.
https://fedorahosted.org/389/ticket/49071
Reviewed by: mreynolds(one line commit rule)
(cherry picked from commit 64b1ebffe5af118965bcdf3a84d62c0fc3efd196)
diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in
index eac59a3..c972805 100644
--- a/ldap/admin/src/scripts/DSUtil.pm.in
+++ b/ldap/admin/src/scripts/DSUtil.pm.in
@@ -1262,7 +1262,7 @@ sub get_info {
last;
}
}
- if($foundcfg eq "yes"){
+ if($foundcfg eq "yes" && $entry){
$info{cacertfile} = $entry->getValues("CACertExtractFile");
if ($info{cacertfile}) {
$ENV{LDAPTLS_CACERT}=$info{cacertfile};
diff --git a/ldap/servers/slapd/back-ldbm/import.c
b/ldap/servers/slapd/back-ldbm/import.c
index 78aefbf..b1ce6cd 100644
--- a/ldap/servers/slapd/back-ldbm/import.c
+++ b/ldap/servers/slapd/back-ldbm/import.c
@@ -1472,12 +1472,12 @@ error:
}
}
if (0 != ret) {
+ dblayer_instance_close(job->inst->inst_be);
if (!(job->flags & (FLAG_DRYRUN|FLAG_UPGRADEDNFORMAT_V1))) {
/* If not dryrun NOR upgradedn space */
/* if running in the dry run mode, don't touch the db */
dblayer_delete_instance_dir(be);
}
- dblayer_instance_close(job->inst->inst_be);
} else {
if (0 != (ret = dblayer_instance_close(job->inst->inst_be)) ) {
import_log_notice(job, "Failed to close database");