win_domain - fix for checking for domain on new host (#55195)

6 years ago · 6039ff9a24
parent a5f13dd361
commit 6039ff9a24
2 changed files with 4 additions and 1 deletions
--- a/changelogs/fragments/win_domain-setup.yaml
+++ b/changelogs/fragments/win_domain-setup.yaml
@ -0,0 +1,2 @@
+bugfixes:
+- win_domain - Fix checking for a domain introduced in a recent patch
--- a/lib/ansible/modules/windows/win_domain.ps1
+++ b/lib/ansible/modules/windows/win_domain.ps1
@ -74,7 +74,8 @@ try {
    # Cannot use Get-ADForest as that requires credential delegation, the below does not
    $forest_context = New-Object -TypeName System.DirectoryServices.ActiveDirectory.DirectoryContext -ArgumentList Forest, $dns_domain_name
    $forest = [System.DirectoryServices.ActiveDirectory.Forest]::GetForest($forest_context)
-} catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryObjectNotFoundException] { }
+} catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryObjectNotFoundException] {
+} catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryOperationException] { }

 if (-not $forest) {
    $result.changed = $true