Merge pull request #639 from microsoft/dpaul-SetupAssistChildFix

SetupAssist - Fixed issue when running from Child Domain for Test-ValidHomeMdb
microsoft · Jul 23, 2021 · 46517d1 · 46517d1
2 parents 23a2f01 + 0327cdd
commit 46517d1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Setup/SetupAssist/Checks/Test-ValidHomeMdb.ps1 b/Setup/SetupAssist/Checks/Test-ValidHomeMdb.ps1
@@ -3,7 +3,10 @@
 
 Function Test-ValidHomeMDB {
     $filePath = "$PSScriptRoot\validHomeMdb.txt"
-    ldifde -t 3268 -r "(&(objectClass=user)(mailnickname=*)(!(msExchRemoteRecipientType=*))(!(targetAddress=*))(msExchHideFromAddressLists=TRUE)(!(cn=HealthMailbox*)))" -l "distinguishedName,homeMDB" -f $filePath | Out-Null
+    $rootDSE = [ADSI]("LDAP://RootDSE")
+    ldifde -t 3268 -r "(&(objectClass=user)(mailnickname=*)(!(msExchRemoteRecipientType=*))(!(targetAddress=*))(msExchHideFromAddressLists=TRUE)(!(cn=HealthMailbox*)))" `
+        -l "distinguishedName,homeMDB" -f $filePath -d $rootDSE.rootDomainNamingContext | Out-Null
+
     $ldifeObject = @(Get-Content $filePath | ConvertFrom-Ldif)
 
     if ($ldifeObject.Count -gt 0) {
@@ -43,6 +46,6 @@ Function Test-ValidHomeMDB {
             "All Critical Mailboxes have valid HomeMDB values" | Receive-Output
         }
     } else {
-        throw "Unexpected LDIF data."
+        Write-Error "Unexpected LDIF data in Test-ValidHomeMdb."
     }
 }