ldap/admin/src/scripts/DSUtil.pm.in | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 92ad7af9a46ddbe4c3d91d858dbeeb6e3a366d6b
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Fri Apr 16 15:33:15 2010 -0600
Bug 583167 - remove-ds.pl gives error Couldn't open
/etc/sysconfig/dirsrv-$INSTANCE
https://bugzilla.redhat.com/show_bug.cgi?id=583167
Resolves: bug 583167
Bug Description: remove-ds.pl gives error Couldn't open
/etc/sysconfig/dirsrv-$INSTANCE
Reviewed by: nkinder (Thanks!)
Branch: Directory_Server_8_2_Branch
Fix Description: Look for INSTANCE=name and use name as the instance name.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in
index 4b4f6da..acb6991 100644
--- a/ldap/admin/src/scripts/DSUtil.pm.in
+++ b/ldap/admin/src/scripts/DSUtil.pm.in
@@ -959,10 +959,15 @@ sub remove_pidfile
}
my $line;
while($line = <INFILE>) {
+ if ($line =~ /^INSTANCE=\s*(\S+)$/) {
+ $serv_id=$1;
+ last;
+ }
if ($line =~ /start-dirsrv /g) {
my @servline=split(/start-dirsrv /, $line);
@servline=split(/\s+/, $servline[1]);
$serv_id=$servline[0];
+ last;
}
}
close(INFILE);