Commit 929074b3 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2'

parents 0539c34c b3c988f0

changes/bug3963

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/ntmain.c

+1 −1
Original line number Diff line number Diff line
@@ -727,6 +727,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"))
@@ -736,7 +737,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) {