ldap/admin/src/scripts/80upgradednformat.pl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e3a1c293ad7ca37628a51793dd4e0dfc5a2f916
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Jul 2 15:21:54 2013 -0700
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
Reviewed by Rich (Thank you!!)
(cherry picked from commit 4df4aad94f05ec9f8fde32bfe71b453d31092627)
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";