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)

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index f89c50da4127a056956717b8a7e76aa746c1abcf..5d502237b0d440303ab1e361247e1e95c76e5c17 100644 (file)
--- 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 */
 }