Bug 703990 - Support upgrade from Red Hat Directory Server

https://bugzilla.redhat.com/show_bug.cgi?id=703990
Resolves: bug 703990
Bug Description: Support upgrade from Red Hat Directory Server
Reviewed by: nkinder (Thanks!)
Branch: master
Fix Description: Couple of bugs with a previous patch
1) offline import did not work because the import function did not get
the instdir location of ldif2db
2) spelling error in error message
Platforms tested: RHEL6 x86_64 (from RHEL 5 32-bit and 64-bit)
Flag Day: no
Doc impact: yes

ldap/admin/src/scripts/70upgradefromldif.pl

@@ -85,7 +85,7 @@ sub startTaskAndWait {
 }
 
 sub importLDIF {
-  my ($conn, $file, $be, $isrunning, $rc) = @_;
+  my ($conn, $file, $be, $isrunning, $instdir, $rc) = @_;
 
   if ($isrunning) {
       my $cn = "import" . time;
@@ -104,7 +104,7 @@ sub importLDIF {
       $? = 0; # clear
       if ($rc = system("$instdir/ldif2db -n $be -i $file > /dev/null 2>&1")) {
           debug(0, "Could not import $file to database $be - check errors log\n");
-          return ('error_import_check_log', $file, $be, $rc);
+          return ('error_import_check_log', $file, $be, $?);
       }
   }
 

ldap/admin/src/scripts/setup-ds.res.in

@@ -200,5 +200,5 @@ Please check the spelling of the hostname and/or your network configuration.\
 If you proceed with this hostname, you may encounter problems.\
 \
 Do you want to proceed with hostname '%s'?
-error_import_check_log = Error: unable to import file '%s' for backend '%s' - %s.  Check the errrors log for additional information\n
+error_import_check_log = Error: unable to import file '%s' for backend '%s' - %s.  Check the errors log for additional information\n
 error_could_not_parse_nsstate = Error: could not parse nsState from %s.  Value: %s\n