X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=a60c3784ff4fffea7862aee852e943fc496396ca;hb=cba3331a303deccf228fec50f30a87ed9ec784ce;hp=d543c46de27b96e4bc655a060fd79319a58cb1c3;hpb=7b85809e2f4f36f1cb587e255c72409b06d549a9;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index d543c46..a60c378 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -1,6 +1,8 @@
 #include "nssm.h"
 
 extern unsigned long tls_index;
+extern bool is_admin;
+extern imports_t imports;
 
 /* String function */
 int str_equiv(const char *a, const char *b) {
@@ -11,53 +13,52 @@ int str_equiv(const char *a, const char *b) {
   }
 }
 
+/* Remove basename of a path. */
+void strip_basename(char *buffer) {
+  size_t len = strlen(buffer);
+  size_t i;
+  for (i = len; i && buffer[i] != '\\' && buffer[i] != '/'; i--);
+  /* X:\ is OK. */
+  if (i && buffer[i-1] == ':') i++;
+  buffer[i] = '\0';
+}
+
 /* How to use me correctly */
 int usage(int ret) {
-  fprintf(stderr, "NSSM: The non-sucking service manager\n");
-  fprintf(stderr, "Version %s, %s\n", NSSM_VERSION, NSSM_DATE);
-  fprintf(stderr, "Usage: nssm <option> [args]\n\n");
-  fprintf(stderr, "To show service installation GUI:\n\n");
-  fprintf(stderr, "        nssm install [<servicename>]\n\n");
-  fprintf(stderr, "To install a service without confirmation:\n\n");
-  fprintf(stderr, "        nssm install <servicename> <app> [<args>]\n\n");
-  fprintf(stderr, "To show service removal GUI:\n\n");
-  fprintf(stderr, "        nssm remove [<servicename>]\n\n");
-  fprintf(stderr, "To remove a service without confirmation:\n\n");
-  fprintf(stderr, "        nssm remove <servicename> confirm\n");
+  print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_DATE);
   return(ret);
 }
 
-int check_admin(char *action) {
+void check_admin() {
+  is_admin = false;
+
   /* Lifted from MSDN examples */
   PSID AdministratorsGroup;
   SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
-  BOOL ok = AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsGroup);
-  if (ok) {
-    if (! CheckTokenMembership(0, AdministratorsGroup, &ok)) ok = 0;
-    FreeSid(AdministratorsGroup);
-
-    if (ok) return 0;
-
-    fprintf(stderr, "Administator access is needed to %s a service.\n", action);
-    return 1;
-  }
-
-  /* Can't tell if we are admin or not; later operations may fail */
-  return 0;
+  if (! AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsGroup)) return;
+  CheckTokenMembership(0, AdministratorsGroup, /*XXX*/(PBOOL) &is_admin);
+  FreeSid(AdministratorsGroup);
 }
 
 int main(int argc, char **argv) {
+  /* Remember if we are admin */
+  check_admin();
+
   /* Elevate */
   if (argc > 1) {
-    if (str_equiv(argv[1], "install") || str_equiv(argv[1], "remove")) {
-      if (check_admin(argv[1])) exit(100);
-    }
-
     /* Valid commands are install or remove */
     if (str_equiv(argv[1], "install")) {
+      if (! is_admin) {
+        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL);
+        exit(100);
+      }
       exit(pre_install_service(argc - 2, argv + 2));
     }
     if (str_equiv(argv[1], "remove")) {
+      if (! is_admin) {
+        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE);
+        exit(100);
+      }
       exit(pre_remove_service(argc - 2, argv + 2));
     }
   }
@@ -66,17 +67,34 @@ int main(int argc, char **argv) {
   tls_index = TlsAlloc();
 
   /* Register messages */
-  create_messages();
+  if (is_admin) create_messages();
+
+  /*
+    Optimisation for Windows 2000:
+    When we're run from the command line the StartServiceCtrlDispatcher() call
+    will time out after a few seconds on Windows 2000.  On newer versions the
+    call returns instantly.  Check for stdin first and only try to call the
+    function if there's no input stream found.  Although it's possible that
+    we're running with input redirected it's much more likely that we're
+    actually running as a service.
+    This will save time when running with no arguments from a command prompt.
+  */
+  if (_fileno(stdin) < 0) {
+    /* Set up function pointers. */
+    if (get_imports()) exit(111);
 
-  /* Start service magic */
-  SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
-  if (! StartServiceCtrlDispatcher(table)) {
-    unsigned long error = GetLastError();
-    /* User probably ran nssm with no argument */
-    if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) exit(usage(1));
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);
-    exit(100);
+    /* Start service magic */
+    SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
+    if (! StartServiceCtrlDispatcher(table)) {
+      unsigned long error = GetLastError();
+      /* User probably ran nssm with no argument */
+      if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) exit(usage(1));
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);
+      free_imports();
+      exit(100);
+    }
   }
+  else exit(usage(1));
 
   /* And nothing more to do */
   exit(0);