X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=4203c6156afc758f1746365a442b1c70b5cc081f;hb=da50488b3ff915a0f7d394a43a3ec6611421cac7;hp=85add5f041ae3e36db3debaba84d454137de3a86;hpb=06a62a665e152850d082607eced4fa4654f1bf70;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 85add5f..4203c61 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -1,5 +1,7 @@
 #include "nssm.h"
 
+extern unsigned long tls_index;
+
 /* String function */
 int str_equiv(const char *a, const char *b) {
   int i;
@@ -25,10 +27,34 @@ int usage(int ret) {
   return(ret);
 }
 
+int check_admin(char *action) {
+  /* 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;
+}
+
 int main(int argc, char **argv) {
   /* Require an argument since users may try to run nssm directly */
   if (argc == 1) exit(usage(1));
 
+  /* Elevate */
+  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")) {
     exit(pre_install_service(argc - 2, argv + 2));
@@ -39,15 +65,16 @@ int main(int argc, char **argv) {
   /* Undocumented: "run" is used to actually do service stuff */
   if (! str_equiv(argv[1], NSSM_RUN)) exit(usage(2));
 
+  /* Thread local storage for error message buffer */
+  tls_index = TlsAlloc();
+
   /* Register messages */
   create_messages();
 
   /* Start service magic */
   SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
   if (! StartServiceCtrlDispatcher(table)) {
-    char *message = error_string(GetLastError());
-    eventprintf(EVENTLOG_ERROR_TYPE, NSSM_MESSAGE_DEFAULT, "StartServiceCtrlDispatcher() failed: %s", message);
-    if (message) LocalFree(message);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(GetLastError()), 0);
     return 100;
   }