From 8e18f02626031b8ed44cf52d9c037644b3d3f4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 19 Apr 2019 10:59:41 +0200 Subject: [PATCH 1/2] win32: remove lock file upon shutdown Upon named shutdown, the lock file should not just be unlocked but also removed. (cherry picked from commit c506077da54e92ddb6220bd118ff817a9248c4e8) --- bin/named/win32/os.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c index f89c50da41..5d502237b0 100644 --- a/bin/named/win32/os.c +++ b/bin/named/win32/os.c @@ -350,9 +350,9 @@ ns_os_shutdown(void) { if (lockfilefd != -1) { (void) UnlockFile((HANDLE) _get_osfhandle(lockfilefd), 0, 0, 0, 1); - close(lockfilefd); - lockfilefd = -1; } + cleanup_lockfile(); + ntservice_shutdown(); /* This MUST be the last thing done */ } From 48ddc78fb2566fd2b8f853a002d783a66dba10c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 19 Apr 2019 10:59:41 +0200 Subject: [PATCH 2/2] Add CHANGES entry 5214. [bug] win32: named now removes its lock file upon shutdown. [GL #979] (cherry picked from commit e048436805b6301af5ec0197cdcdc799573627f8) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index cf4f4e4d19..efd2bc0cda 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5214. [bug] win32: named now removes its lock file upon shutdown. + [GL #979] + 5213. [bug] win32: Eliminated a race which allowed named.exe running as a service to be killed prematurely during shutdown. [GL #978]