All NT service configuration commands should make the process exit.

Fixes bug 3963; fix on 0.2.0.7-alpha.

diff --git a/changes/bug3963 b/changes/bug3963
new file mode 100644 (file)
index 0000000..2fc44a0
--- /dev/null
+++ b/changes/bug3963
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - When configuring, starting, or stopping an NT service, stop
+      immediately after the service configuration attempt has succeeded
+      or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha.
+

diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index b2fee648ccd36309fe52e940e8102a6c98582df4..985fab73ca7ba67ff50bf419b0c8b23bf55a8ec0 100644 (file)
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -728,6 +728,7 @@ nt_service_parse_options(int argc, char **argv, int *should_exit)
   if ((argc >= 3) &&
       (!strcmp(argv[1], "-service") || !strcmp(argv[1], "--service"))) {
     nt_service_loadlibrary();
+    *should_exit = 1;
     if (!strcmp(argv[2], "install"))
       return nt_service_install(argc, argv);
     if (!strcmp(argv[2], "remove"))
@@ -737,7 +738,6 @@ nt_service_parse_options(int argc, char **argv, int *should_exit)
     if (!strcmp(argv[2], "stop"))
       return nt_service_cmd_stop();
     printf("Unrecognized service command '%s'\n", argv[2]);
-    *should_exit = 1;
     return 1;
   }
   if (argc >= 2) {