Fix AD validation

FOGProject · May 28, 2015 · fe6b67f · fe6b67f
1 parent deafeb7
commit fe6b67f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/FOGService.v12.suo b/FOGService.v12.suo
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
@@ -20,14 +20,14 @@
 -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="FOG Service" Language="1033" Version="0.8.1" UpgradeCode="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA"
+  <Product Id="*" Name="FOG Service" Language="1033" Version="0.8.2" UpgradeCode="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA"
            Manufacturer="FOG">
     <Package Description="FOG Service" Comments="A client for the FOG project" InstallerVersion="300" Compressed="yes"
              InstallScope="perMachine" />
     <!-- Remove old versions -->
     <Upgrade Id="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA">
       <UpgradeVersion OnlyDetect="yes" Minimum="0.0.0" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
-      <UpgradeVersion OnlyDetect="no" Minimum="0.0.0" Maximum="0.8.0" Property="OLDERVERSIONBEINGUPGRADED"
+      <UpgradeVersion OnlyDetect="no" Minimum="0.0.0" Maximum="0.8.1" Property="OLDERVERSIONBEINGUPGRADED"
                       IncludeMinimum="no" IncludeMaximum="yes" MigrateFeatures="yes" />
     </Upgrade>
     <InstallExecuteSequence>

diff --git a/Modules/HostnameChanger/HostnameChanger.cs b/Modules/HostnameChanger/HostnameChanger.cs
@@ -156,7 +156,7 @@ private void RegisterComputer(Response response)
                 return;
             }
 
-            if (!response.IsFieldValid("ADDom") && !response.IsFieldValid("ADUser") && !response.IsFieldValid("ADPass"))
+            if (!response.IsFieldValid("#ADDom") || !response.IsFieldValid("#ADUser") || !response.IsFieldValid("#ADPass"))
             {
                 LogHandler.Error(Name, "Required Domain Joining information is missing");
                 return;