diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-02-05 22:02:58 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-02-05 22:02:58 +0000 |
| commit | e0acb45b861add5f4bd3f869ea322504b85d812e (patch) | |
| tree | 06b00cef21b5efb3f293512828e027d90a0e2162 /src/or | |
| parent | d930440ae53aa9796cfdf377f6ecd147cb15fa5a (diff) | |
| download | tor-e0acb45b861add5f4bd3f869ea322504b85d812e.tar.gz tor-e0acb45b861add5f4bd3f869ea322504b85d812e.zip | |
r11650@catbus: nickm | 2007-02-05 17:02:54 -0500
Resolve (I hope) remaining nt service compilation issues.
svn:r9489
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index b0d07034a5..239840ce51 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -69,7 +69,6 @@ int has_completed_circuit=0; #ifdef MS_WINDOWS #define MS_WINDOWS_SERVICE -#includ "Windows.h" #endif #ifdef MS_WINDOWS_SERVICE @@ -2156,7 +2155,7 @@ nt_service_install(int argc, char **argv) char *command; char *errmsg; const char *user_acct = GENSRV_USERACCT; - int i,r; + int i; SID_NAME_USE sidUse; if (nt_service_loadlibrary()<0) @@ -2172,7 +2171,7 @@ nt_service_install(int argc, char **argv) return -1; } for (i=1; i < argc; ++i) { - if (!strcmp(i, "--user") && i+1<argc) { + if (!strcmp(argv[i], "--user") && i+1<argc) { user_acct = argv[i+1]; ++i; } @@ -2373,7 +2372,7 @@ tor_main(int argc, char *argv[]) fprintf(stderr, "The %s option is deprecated; use \"--service install\" instead.", argv[1]); - return nt_service_install(); + return nt_service_install(argc, argv); } if (!strcmp(argv[1], "-remove") || !strcmp(argv[1], "--remove")) { fprintf(stderr, |