[or-cvs] r9489: Resolve (I hope) remaining nt service compilation issues. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-05 17:02:58 -0500 (Mon, 05 Feb 2007)
New Revision: 9489

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r11650 at catbus:  nickm | 2007-02-05 17:02:54 -0500
 Resolve (I hope) remaining nt service compilation issues.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11650] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-02-05 21:48:53 UTC (rev 9488)
+++ tor/trunk/src/or/main.c	2007-02-05 22:02:58 UTC (rev 9489)
@@ -69,7 +69,6 @@
 
 #ifdef MS_WINDOWS
 #define MS_WINDOWS_SERVICE
-#includ "Windows.h"
 #endif
 
 #ifdef MS_WINDOWS_SERVICE
@@ -2156,7 +2155,7 @@
   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 @@
     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 @@
       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,