From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 23 Feb 2005 05:34:25 +0000 (+0000)
Subject: Forward-port fix to make dual-purpose NT executable work.
X-Git-Tag: tor-0.1.0.1-rc~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ff6cfccd68b069ef05bc43b8f3f2e290aff0437;p=thirdparty%2Ftor.git

Forward-port fix to make dual-purpose NT executable work.


svn:r3665
---

diff --git a/src/or/main.c b/src/or/main.c
index 6ac83e1728..74b7b7dcda 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1645,11 +1645,14 @@ int tor_main(int argc, char *argv[]) {
     nt_service_main();
     return 0;
   }
-#else
+#endif
   if (tor_init(argc, argv)<0)
     return -1;
   switch (get_options()->command) {
   case CMD_RUN_TOR:
+#ifdef MS_WINDOWS_SERVICE 
+    service_status.dwCurrentState = SERVICE_RUNNING;
+#endif
     do_main_loop();
     break;
   case CMD_LIST_FINGERPRINT:
@@ -1664,6 +1667,5 @@ int tor_main(int argc, char *argv[]) {
   }
   tor_cleanup();
   return -1;
-#endif
 }