From b074c1b5a14b518365dca40294fbfd16d9560cab Mon Sep 17 00:00:00 2001
From: chronicules <d.vasilyev@gmail.com>
Date: Wed, 26 May 2021 16:21:39 -0400
Subject: [PATCH] Updated /usr/sbin/adcli testjoin condition

'adcli testjoin' is great when your hostname domain matches joined domain.
For cases when you joined a different domain it's better to include it's full domain name in a validation.
---
 manifests/join.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/join.pp b/manifests/join.pp
index 1b94f9f..361cea5 100644
--- a/manifests/join.pp
+++ b/manifests/join.pp
@@ -66,7 +66,7 @@
 --stdin-password --verbose ${ad_join_os_command} ${ad_join_os_version_command} ${ad_join_os_service_pack_command} \
 ${ad_join_service_names_command}",
       logoutput => true,
-      unless    => '/usr/sbin/adcli testjoin',
+      unless    => "/usr/sbin/adcli testjoin -D ${ad_domain}",
     }
   }
 }