From: Michał Kępień <michal@isc.org>
Date: Fri, 19 Apr 2019 08:59:41 +0000 (+0200)
Subject: win32: remove lock file upon shutdown
X-Git-Tag: v9.15.0~38^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c506077da54e92ddb6220bd118ff817a9248c4e8;p=thirdparty%2Fbind9.git

win32: remove lock file upon shutdown

Upon named shutdown, the lock file should not just be unlocked but also
removed.
---

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index f302338c66a..ec6da58c94e 100644
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -348,9 +348,9 @@ named_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 */
 }