From a37d2807f559f1ccbe5923a2c7e4f5efae0dc8f1 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Wed, 29 Aug 2007 16:33:40 +0000 Subject: Resolves: #260341 Summary: Migration script references a non-existing directory Description: added an if clause for the with_fhs_opt case --- ldap/admin/src/scripts/DSMigration.pm.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ldap/admin/src/scripts') diff --git a/ldap/admin/src/scripts/DSMigration.pm.in b/ldap/admin/src/scripts/DSMigration.pm.in index e3cda816..325aa903 100644 --- a/ldap/admin/src/scripts/DSMigration.pm.in +++ b/ldap/admin/src/scripts/DSMigration.pm.in @@ -262,8 +262,14 @@ sub migrateDatabases { 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'); -- cgit