Merge branch '979-win32-remove-lock-file-upon-shutdown-v9_11' into 'v9_11'

[v9_11] win32: remove lock file upon shutdown

See merge request !1833

CHANGES

+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]

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 */
 }