admserv/newinst/src/AdminServer.pm.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit db76324dfe83b748ef28e85ad968f7bd3d972716
Author: noriko <nhosoi(a)localhost.localdomain>
Date: Wed Mar 27 15:07:06 2013 -0700
Ticket #47298 - remove-ds-admin.pl does not stop the admin server
Bug description: Keyword to be replaced for the build had a
typo in the stopAdminServer subroutine.
Fix description: Replacing "@with_systemdsystemunitdir@" with
"@systemdsystemunitdir@".
https://fedorahosted.org/389/ticket/47298
Reviewed by Mark (Thank you!!)
diff --git a/admserv/newinst/src/AdminServer.pm.in
b/admserv/newinst/src/AdminServer.pm.in
index d769522..937df8a 100644
--- a/admserv/newinst/src/AdminServer.pm.in
+++ b/admserv/newinst/src/AdminServer.pm.in
@@ -605,10 +605,10 @@ sub reconfigAdminServer {
sub stopAdminServer {
my $prog = "@sbindir@/stop-ds-admin";
- if ("@with_systemdsystemunitdir@") {
- $prog = "/bin/systemctl stop @package_name@.service";
- } elsif ("@enable_service@") {
+ if ("@enable_service@") {
$prog = "service @package_name@ stop";
+ } elsif ("@systemdsystemunitdir@") {
+ $prog = "/bin/systemctl stop @package_name@.service";
} elsif (! -x $prog) {
debug(1, "stopping admin server: no such program $prog: cannot stop
server\n");
return 0;