Merge pull request #1352 from ykuijs/bugfix

[SPSearchServiceApp] Added SQL Auth check to Test method
dsccommunity · Nov 5, 2021 · 138c692 · 138c692
2 parents c1f1df4 + d844b21
commit 138c692
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Fixed issue where the resource was using hardcoded SP2016 and later paths
     and therefore didn't work in SP2013
 - SPSearchServiceApp
-  - Disabled Farm account DB ownership updating functions when using SQL Auth
+  - Disabled the Farm account DB ownership check when using SQL Auth
 - SPServiceAppPool
   - Fixed issue in Export method where the PsDscRunAsCredential was stored as
     a string instead of a PsCredential object

diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1
@@ -724,7 +724,18 @@ function Test-TargetResource
     Write-Verbose -Message "Testing Search service application '$Name'"
 
     $PSBoundParameters.Ensure = $Ensure
-    $PSBoundParameters.FixFarmAccountPermissions = $FixFarmAccountPermissions
+
+    if ($UseSQLAuthentication -eq $true)
+    {
+        Write-Verbose ("Cannot check Farm Account permissions when SQL " + `
+                "DatabaseCredentials are specified.")
+        Write-Verbose "Setting FixFarmAccountPermissions to False"
+        $PSBoundParameters.FixFarmAccountPermissions = $false
+    }
+    else
+    {
+        $PSBoundParameters.FixFarmAccountPermissions = $FixFarmAccountPermissions
+    }
 
     $CurrentValues = Get-TargetResource @PSBoundParameters