Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7525/adminserver/admserv/newinst/src
Modified Files:
AdminServer.pm.in
Log Message:
Resolves: bug 295001
Bug Description: Migration - Can't Start Admin Server
Reviewed by: nhosoi (Thanks!)
Fix Description: The migration script was clobbering console.conf instead of replacing the
Group information.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AdminServer.pm.in 14 Sep 2007 21:26:08 -0000 1.9
+++ AdminServer.pm.in 18 Sep 2007 17:11:47 -0000 1.10
@@ -330,14 +330,14 @@
debug(0, "Error opening $admConf->{configdir}/console.conf:
$!");
return 0;
}
- my $contents = <CONSOLECONF>;
+ my @contents = <CONSOLECONF>;
close (CONSOLECONF);
- $contents =~ s/^Group.*$/Group $admConf->{sysgroup}/;
+ grep { s/^Group.*$/Group $admConf->{sysgroup}/ } @contents
if (!open(CONSOLECONF, ">$admConf->{configdir}/console.conf")) {
debug(0, "Error writing new group $admConf->{sysgroup} to
$admConf->{configdir}/console.conf: $!");
return 0;
}
- print CONSOLECONF $contents;
+ print CONSOLECONF @contents;
close (CONSOLECONF);
}
return 1;
Show replies by date