[or-cvs] Correct logic in dual service/executable mode. (Still not o...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv11986/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	main.c 
Log Message:
Correct logic in dual service/executable mode. (Still not on by default.)

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.407.2.13
retrieving revision 1.407.2.14
diff -u -d -r1.407.2.13 -r1.407.2.14
--- main.c	19 Feb 2005 03:42:28 -0000	1.407.2.13
+++ main.c	23 Feb 2005 04:58:17 -0000	1.407.2.14
@@ -1419,11 +1419,14 @@
     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:
@@ -1438,6 +1441,5 @@
   }
   tor_cleanup();
   return -1;
-#endif
 }