Fix #1633 Windows service is not removed if still running

[bacula/bacula] / bacula / src / win32 / libwin32 / service.cpp

diff --git a/bacula/src/win32/libwin32/service.cpp b/bacula/src/win32/libwin32/service.cpp
index c34de5a6105332c4525f7bf2e871ca2e1c84f2f3..4537f791fec3f460365b1e074200cb5308051a21 100644 (file)
--- a/bacula/src/win32/libwin32/service.cpp
+++ b/bacula/src/win32/libwin32/service.cpp
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
@@ -292,7 +292,7 @@ int installService(const char *cmdOpts)
 
       /* Set a text description in the service manager's control panel */
       set_service_description(serviceManager, baculaService,
-_("Provides file backup and restore services. Bacula -- the network backup solution."));
+(char *)_("Provides file backup and restore services. Bacula -- the network backup solution."));
 
       CloseServiceHandle(serviceManager);
       CloseServiceHandle(baculaService);
@@ -357,7 +357,7 @@ int removeService()
                   if (status.dwCurrentState == SERVICE_STOP_PENDING) {
                      sleep(1);
                   } else {
-                     return 0;
+                     break;
                   }
                }
                if (status.dwCurrentState != SERVICE_STOPPED) {