From ac9dd0ce720f3bf049b20263db1d582117ba7afd Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Tue, 2 Jul 2013 15:21:54 -0700 Subject: [PATCH] Ticket #47420 - An upgrade script 80upgradednformat.pl fails to handle a server instance name incuding '-' Bug description: If a server instance name contains '-', e.g., slapd-TEST-SERVER, it accidentally picks up the first part of the instance name 'TEST'. Fix description: Replacing "split(/-/, $instancedir)" with "split(/-/, $instancedir, 2)". https://fedorahosted.org/389/ticket/47420 --- ldap/admin/src/scripts/80upgradednformat.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap/admin/src/scripts/80upgradednformat.pl.in b/ldap/admin/src/scripts/80upgradednformat.pl.in index aa433e3..c566b42 100644 --- a/ldap/admin/src/scripts/80upgradednformat.pl.in +++ b/ldap/admin/src/scripts/80upgradednformat.pl.in @@ -86,7 +86,7 @@ sub runinst { my $ldifdir = $config_entry->{"nsslapd-ldifdir"}[0]; my $instancedir = $config_entry->{"nsslapd-instancedir"}[0]; - my ($slapd, $serverID) = split(/-/, $instancedir); + my ($slapd, $serverID) = split(/-/, $instancedir, 2); my $upgradednformat = "@sbindir@/upgradednformat -Z $serverID"; my $reindex = "@sbindir@/db2index -Z $serverID"; -- 1.8.3.1