- Fix #768: Unbound Service Sometimes Can Not Shutdown

  Completely, WER Report Shown Up.  Close handle before closing WSA.

git-svn-id: file:///svn/unbound/trunk@3731 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 5e900978722733ac306a4ad0db287282175b3b89..ee5f9abd1de9c90011635f043c7d40c39eadd3ba 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
        - Fix #770: Small subgroup attack on DH used in unix pipe on localhost
          if unbound control uses a unix local named pipe.
        - Document write permission to directory of trust anchor needed.
+       - Fix #768:  Unbound Service Sometimes Can Not Shutdown
+         Completely, WER Report Shown Up.  Close handle before closing WSA.
 
 26 May 2016: Wouter
        - Updated patch from Charles Walker.

diff --git a/winrc/win_svc.c b/winrc/win_svc.c
index a0ddd384509fb171e01e293dc95b32dc7aade0a5..b9cd142d21f719ff6f8c47362e0be24abe05ca3e 100644 (file)
--- a/winrc/win_svc.c
+++ b/winrc/win_svc.c
@@ -453,9 +453,9 @@ service_main(DWORD ATTR_UNUSED(argc), LPTSTR* ATTR_UNUSED(argv))
        /* exit */
        verbose(VERB_ALGO, "winservice - cleanup.");
        report_status(SERVICE_STOP_PENDING, NO_ERROR, 0);
+       if(service_stop_event) (void)WSACloseEvent(service_stop_event);
        service_deinit(daemon, cfg);
        free(service_cfgfile);
-       if(service_stop_event) (void)WSACloseEvent(service_stop_event);
        verbose(VERB_QUERY, "winservice - full stop");
        report_status(SERVICE_STOPPED, NO_ERROR, 0);
 }