Merge branch '978-win32-fix-service-state-reported-during-shutdown-v9_11' into 'v9_11'

[v9_11] win32: fix service state reported during shutdown

See merge request isc-projects/bind9!1831
This commit is contained in:
Michał Kępień 2019-04-19 04:19:36 -04:00
commit 2adc28712d
2 changed files with 5 additions and 1 deletions

View file

@ -1,3 +1,7 @@
5213. [bug] win32: Eliminated a race which allowed named.exe running
as a service to be killed prematurely during shutdown.
[GL #978]
5210. [bug] When dnstap is enabled and recursion is not
available, incoming queries are now logged
as "auth". Previously, this depended on whether

View file

@ -82,7 +82,7 @@ ServiceControl(DWORD dwCtrlCode) {
case SERVICE_CONTROL_STOP:
ns_server_flushonshutdown(ns_g_server, true);
isc_app_shutdown();
UpdateSCM(SERVICE_STOPPED);
UpdateSCM(SERVICE_STOP_PENDING);
break;
default:
break;