Fix compiler warnings

[icinga2] / agent / windows-setup-agent / Program.cs

diff --git a/agent/windows-setup-agent/Program.cs b/agent/windows-setup-agent/Program.cs
index e132bc1b1b98c35ff30c51c5feb5d32823c64c64..b22b042eb70e077df81744489982638ec4a3e44b 100644 (file)
--- a/agent/windows-setup-agent/Program.cs
+++ b/agent/windows-setup-agent/Program.cs
@@ -7,54 +7,74 @@ using System.Text;
 
 namespace Icinga
 {
-       static class Program
-       {
-        [DllImport("msi.dll", SetLastError = true)]
-        static extern int MsiEnumProducts(int iProductIndex, StringBuilder lpProductBuf);
+    internal static class NativeMethods
+    {
+        [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+        internal static extern int MsiEnumProducts(int iProductIndex, StringBuilder lpProductBuf);
 
         [DllImport("msi.dll", CharSet = CharSet.Unicode)]
-        static extern Int32 MsiGetProductInfo(string product, string property, [Out] StringBuilder valueBuf, ref Int32 len);
+        internal static extern Int32 MsiGetProductInfo(string product, string property, [Out] StringBuilder valueBuf, ref Int32 len);
+    }
 
-        public static string Icinga2InstallDir
+    static class Program
+       {
+               public static string Icinga2InstallDir
                {
                        get
                        {
-                StringBuilder szProduct;
+                               StringBuilder szProduct;
 
-                for (int index = 0; ; index++) {
-                    szProduct = new StringBuilder(39);
-                    if (MsiEnumProducts(index, szProduct) != 0)
-                        break;
+                               for (int index = 0; ; index++) {
+                                       szProduct = new StringBuilder(39);
+                                       if (NativeMethods.MsiEnumProducts(index, szProduct) != 0)
+                                               break;
 
-                    int cbName = 128;
-                    StringBuilder szName = new StringBuilder(cbName);
+                                       int cbName = 128;
+                                       StringBuilder szName = new StringBuilder(cbName);
 
-                    if (MsiGetProductInfo(szProduct.ToString(), "ProductName", szName, ref cbName) != 0)
-                        continue;
+                                       if (NativeMethods.MsiGetProductInfo(szProduct.ToString(), "ProductName", szName, ref cbName) != 0)
+                                               continue;
 
-                    if (szName.ToString() != "Icinga 2")
-                        continue;
+                                       if (szName.ToString() != "Icinga 2")
+                                               continue;
 
-                    int cbLocation = 1024;
-                    StringBuilder szLocation = new StringBuilder(cbLocation);
-                    if (MsiGetProductInfo(szProduct.ToString(), "InstallLocation", szLocation, ref cbLocation) == 0)
-                        return szLocation.ToString();
-                }
+                                       int cbLocation = 1024;
+                                       StringBuilder szLocation = new StringBuilder(cbLocation);
+                                       if (NativeMethods.MsiGetProductInfo(szProduct.ToString(), "InstallLocation", szLocation, ref cbLocation) == 0)
+                                               return szLocation.ToString();
+                               }
 
-                return "";
+                               return "";
                        }
                }
 
-        public static string Icinga2DataDir
-        {
-            get
-            {
-                return Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\icinga2";
-            }
-        }
+               public static string Icinga2DataDir
+               {
+                       get
+                       {
+                               return Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\icinga2";
+                       }
+               }
+
+               public static string Icinga2User
+               {
+                       get
+                       {
+                               if (!File.Exists(Icinga2DataDir + "\\etc\\icinga2\\user"))
+                                       return "NT AUTHORITY\\NetworkService";
+                               System.IO.StreamReader file = new System.IO.StreamReader(Icinga2DataDir + "\\etc\\icinga2\\user");
+                               string line = file.ReadLine();
+                               file.Close();
+
+                               if (line != null)
+                                       return line;
+                               else
+                                       return "NT AUTHORITY\\NetworkService";
+                       }
+               }
 
 
-        public static void FatalError(Form owner, string message)
+               public static void FatalError(Form owner, string message)
                {
                        MessageBox.Show(owner, message, "Icinga 2 Setup Wizard", MessageBoxButtons.OK, MessageBoxIcon.Error);
                        Application.Exit();
@@ -71,10 +91,10 @@ namespace Icinga
 
                        string installDir = Program.Icinga2InstallDir;
 
-            if (installDir == "") {
-                FatalError(null, "Icinga 2 does not seem to be installed properly.");
-                return;
-            }
+                       if (installDir == "") {
+                               FatalError(null, "Icinga 2 does not seem to be installed properly.");
+                               return;
+                       }
 
                        Form form;