Skip to content

Fixed an issue where microsoft.ad.domain module did not error correctly #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AllRWeak wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Fixed an issue where microsoft.ad.domain module did not error correctly #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion plugins/modules/domain.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,18 @@ catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryOperationExceptio
$forest = $null
}

if (-not $forest) {
try {
# ProductType 2 means the host is a domain controller, 1 means it's a workstation and 3 means it's a server that is a server
$host_is_dc = (Get-CimInstance -ClassName Win32_OperatingSystem -Property ProductType).ProductType -eq 2
}
catch {
$module.FailJson("Failed to determine if the host is already a domain controller: $($_.Exception.Message)")
}

# Only installing the domain if the forest does not exist or the host is not a domain controller
# This is to avoid an issue where the domain may already exist in another domain controller but the host itself is not a DC
# By trying to run Install-ADDSForest in that scenario it will fail with the correct error message
if (-not $forest -or -not $host_is_dc) {
$installParams = @{
DomainName = $dns_domain_name
SafeModeAdministratorPassword = (ConvertTo-SecureString $safe_mode_password -AsPlainText -Force)
Expand Down