Browse Source

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)
Mark Reynolds 9 years ago
parent
commit
64b1ebffe5
2 changed files with 2 additions and 2 deletions
  1. 1 1
      ldap/admin/src/scripts/DSUtil.pm.in
  2. 1 1
      ldap/servers/slapd/back-ldbm/import.c

+ 1 - 1
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};

+ 1 - 1
ldap/servers/slapd/back-ldbm/import.c

@@ -1485,12 +1485,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, SLAPI_LOG_WARNING, "import_main_offline", "Failed to close database");