Commit 2adc2871 authored by Michał Kępień's avatar Michał Kępień

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 !1831
parents 00e59aca 89c8fed4
Pipeline #13645 passed with stages
in 1 minute and 2 seconds
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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment