Handle running without administrator privileges.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index d543c46..7a73114 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -1,6 +1,7 @@
 #include "nssm.h"\r
 \r
 extern unsigned long tls_index;\r
+extern bool is_admin;\r
 \r
 /* String function */\r
 int str_equiv(const char *a, const char *b) {\r
@@ -27,30 +28,28 @@ int usage(int ret) {
   return(ret);\r
 }\r
 \r
-int check_admin(char *action) {\r
+void check_admin() {\r
+  is_admin = false;\r
+\r
   /* Lifted from MSDN examples */\r
   PSID AdministratorsGroup;\r
   SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;\r
-  BOOL ok = AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsGroup);\r
-  if (ok) {\r
-    if (! CheckTokenMembership(0, AdministratorsGroup, &ok)) ok = 0;\r
-    FreeSid(AdministratorsGroup);\r
-\r
-    if (ok) return 0;\r
-\r
-    fprintf(stderr, "Administator access is needed to %s a service.\n", action);\r
-    return 1;\r
-  }\r
-\r
-  /* Can't tell if we are admin or not; later operations may fail */\r
-  return 0;\r
+  if (! AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsGroup)) return;\r
+  CheckTokenMembership(0, AdministratorsGroup, /*XXX*/(PBOOL) &is_admin);\r
+  FreeSid(AdministratorsGroup);\r
 }\r
 \r
 int main(int argc, char **argv) {\r
+  /* Remember if we are admin */\r
+  check_admin();\r
+\r
   /* Elevate */\r
   if (argc > 1) {\r
     if (str_equiv(argv[1], "install") || str_equiv(argv[1], "remove")) {\r
-      if (check_admin(argv[1])) exit(100);\r
+      if (! is_admin) {\r
+        fprintf(stderr, "Administrator access is needed to %s a service.\n", argv[1]);\r
+        exit(100);\r
+      }\r
     }\r
 \r
     /* Valid commands are install or remove */\r
@@ -66,7 +65,7 @@ int main(int argc, char **argv) {
   tls_index = TlsAlloc();\r
 \r
   /* Register messages */\r
-  create_messages();\r
+  if (is_admin) create_messages();\r
 \r
   /* Start service magic */\r
   SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };\r