Merge pull request #1418 from hollanjs/fix-issue-1417

SPTrustedRootAuthority - Fix Error while adding Trusted Root Authority via CertificateThumbprint
dsccommunity · Mar 17, 2023 · 0cc9fef · 0cc9fef
2 parents 07a8f71 + c4cf42f
commit 0cc9fef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- SPTrustedRootAuthority
+  - Added `-Recurse` flag to `Get-ChildItem` when setting
+    certificate by Thumbprint.
+
 ## [5.3.0] - 2022-11-15
 
 ### Added
@@ -262,8 +266,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Added support for LogonTokenCacheExpirationWindow, WindowsTokenLifetime and FormsTokenLifetime settings
 - SPService
   - New resource
- - SPSecurityTokenServiceConfig
-  - Added support for LogonTokenCacheExpirationWindow, WindowsTokenLifetime and FormsTokenLifetime settings
+- SPSecurityTokenServiceConfig
+- Added support for LogonTokenCacheExpirationWindow, WindowsTokenLifetime and FormsTokenLifetime settings
 - SPUsageDefinition
   - New resource
 - SPUserProfileProperty

diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1
@@ -182,7 +182,7 @@ function Set-TargetResource
             else
             {
                 Write-Verbose -Message "Importing certificate from CertificateThumbprint"
-                $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" `
+                $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" -Recurse `
                     -ErrorAction SilentlyContinue | `
                         Sort-Object -Property PSParentPath -Descending | `
                             Select-Object -First 1
@@ -264,7 +264,7 @@ function Set-TargetResource
             else
             {
                 Write-Verbose -Message "Importing certificate from CertificateThumbprint"
-                $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" `
+                $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" -Recurse `
                     -ErrorAction SilentlyContinue | `
                         Sort-Object -Property PSParentPath -Descending | `
                             Select-Object -First 1