win32: fix service state reported during shutdown

When a Windows service receives a request to stop, it should not set its
state to SERVICE_STOPPED until it is completely shut down as doing that
allows the operating system to kill that service prematurely, which in
the case of named may e.g. prevent the PID file and/or the lock file
from being cleaned up.

Set service state to SERVICE_STOP_PENDING when named begins its shutdown
and only report the SERVICE_STOPPED state immediately before exiting.

diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index dbb19c9beac0766f7caeb96766c56a52a2d5f56a..986993f4f1adb191ff42ec1063185916fa6d428f 100644 (file)
--- a/bin/named/win32/ntservice.c
+++ b/bin/named/win32/ntservice.c
@@ -81,7 +81,7 @@ ServiceControl(DWORD dwCtrlCode) {
        case SERVICE_CONTROL_STOP:
                named_server_flushonshutdown(named_g_server, true);
                isc_app_shutdown();
-               UpdateSCM(SERVICE_STOPPED);
+               UpdateSCM(SERVICE_STOP_PENDING);
                break;
        default:
                break;