Fix for windows crash at start (after install for example)

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

diff --git a/doc/Changelog b/doc/Changelog
index c5c94239a3ca13f1ee2fa721ae67ab8acac31436..dc049640ba4289773cb3218f272784fb29fa9fc7 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+13 July 2009: Wouter
+       - Fix for crash at start on windows.
+
 9 July 2009: Wouter
        - tag for release 1.3.1.
        - trunk has version 1.3.2.

diff --git a/winrc/win_svc.c b/winrc/win_svc.c
index 4b7e02aed93dec81a4974fe47a2390e048fd3a95..6513b52e36fe026553992f163d974bd67a16a274 100644 (file)
--- a/winrc/win_svc.c
+++ b/winrc/win_svc.c
@@ -48,6 +48,7 @@
 #include "winrc/w_inst.h"
 #include "daemon/daemon.h"
 #include "daemon/worker.h"
+#include "daemon/remote.h"
 #include "util/config_file.h"
 #include "util/netevent.h"
 #include "util/winsock_event.h"
@@ -283,7 +284,15 @@ service_init(int r, struct daemon** d, struct config_file** c)
        if(!r) report_status(SERVICE_START_PENDING, NO_ERROR, 2400);
        verbose(VERB_QUERY, "winservice - apply cfg");
        daemon_apply_cfg(daemon, cfg);
-       
+
+       if(!r) report_status(SERVICE_START_PENDING, NO_ERROR, 2300);
+       if(!(daemon->rc = daemon_remote_create(cfg))) {
+               log_err("could not set up remote-control");
+               daemon_delete(daemon);
+               config_delete(cfg);
+               return 0;
+       }
+
        /* open ports */
        /* keep reporting that we are busy starting */
        if(!r) report_status(SERVICE_START_PENDING, NO_ERROR, 2200);