Merge pull request #76 from BristleBeard/dev

DomainName check validates child without FQDN
dsccommunity · Jul 16, 2017 · e54626d · e54626d
2 parents 09d3709 + cac9e3d
commit e54626d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1 b/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1
@@ -234,11 +234,23 @@ function Test-TargetResource
         {
             throw "Need to specify credentials with domain"
         }
-        
+
         try
         {
             Write-Verbose "Checking if the machine is a member of $DomainName."
-            return ($DomainName.ToLower() -eq (GetComputerDomain).ToLower())
+            if ($DomainName.Contains('.'))
+            {
+                $getComputerDomainSplat = @{
+                    netbios = $false
+                }
+            }
+            else
+            {
+                $getComputerDomainSplat = @{
+                    netbios = $true
+                }
+            }
+            return ($DomainName -eq (GetComputerDomain @getComputerDomainSplat ))
         }
         catch
         {
@@ -268,9 +280,25 @@ function ValidateDomainOrWorkGroup($DomainName, $WorkGroupName)
 
 function GetComputerDomain
 {
-  try
+    [CmdletBinding()]
+    param
+    (
+        [Parameter()]
+        [Switch]
+        $NetBios
+    )
+
+    try
     {
-        return ([System.DirectoryServices.ActiveDirectory.Domain]::GetComputerDomain()).Name
+        if ($NetBios)
+        {
+            $domainName = $ENV:USERDOMAIN
+        }
+        else
+        {
+            $domainName = ([System.DirectoryServices.ActiveDirectory.Domain]::GetComputerDomain()).Name
+        }
+        return $domainName
     }
     catch [System.Management.Automation.MethodInvocationException]
     {

diff --git a/README.md b/README.md
@@ -119,6 +119,7 @@ xVirtualMemory has the following properties:
 ## Versions
 
 ### Unreleased
+* xComputer: Changed comparision that validates if we are in the correct AD Domain to work correctly if FQDN wasn't used
 
 ### 2.0.0.0
 * Updated resources