[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSMigration.pm.in, 1.5, 1.6

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28030

Modified Files:
	DSMigration.pm.in 
Log Message:
Resolves: #260341
Summary: Migration script references a non-existing directory
Description: added an if clause for the with_fhs_opt case



Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSMigration.pm.in	15 Aug 2007 22:04:31 -0000	1.5
+++ DSMigration.pm.in	29 Aug 2007 16:33:40 -0000	1.6
@@ -262,8 +262,14 @@
         my %objclasses = map { lc($_) => $_ } $ent->getValues('objectclass');
         if ($cn eq 'config') { # global config
             my $newent = $dest->search($ent->getDN(), "base", "(objectclass=*)");
-            my $newdbdir = $newent->getValues('nsslapd-directory') ||
-                "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+            my $newdbdir = "";
+            if ("@with_fhs_opt@") {
+                $newdbdir = $newent->getValues('nsslapd-directory') ||
+                    "@localstatedir@/$mig->{pkgname}/$inst/db";
+            } else {
+                $newdbdir = $newent->getValues('nsslapd-directory') ||
+                    "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+            }
             debug(1, "Found ldbm database plugin config entry ", $ent->getDN(), "\n");
             my $dir = $ent->getValues('nsslapd-directory');
             my $homedir = $ent->getValues('nsslapd-db-home-directory');