From 5c5e5a23a29d5f2ad513477de9028910a90b29f3 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 14 Jul 2014 13:04:42 +1000 Subject: [PATCH] Bug Fix #61: Fix Decommission/Recommission Device Checks to ensure a device domain id is valid before interacting with AD. --- Disco.BI/BI/Extensions/DeviceActionExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Disco.BI/BI/Extensions/DeviceActionExtensions.cs b/Disco.BI/BI/Extensions/DeviceActionExtensions.cs index 7c0ebbf4..e0a17ce1 100644 --- a/Disco.BI/BI/Extensions/DeviceActionExtensions.cs +++ b/Disco.BI/BI/Extensions/DeviceActionExtensions.cs @@ -88,7 +88,7 @@ namespace Disco.BI.Extensions d.DecommissionReason = Reason; // Disable AD Account - if (d.DeviceDomainId != null) + if (ActiveDirectory.IsValidDomainAccountId(d.DeviceDomainId)) { var adAccount = d.ActiveDirectoryAccount(); if (adAccount != null && !adAccount.IsCriticalSystemObject) @@ -115,7 +115,7 @@ namespace Disco.BI.Extensions d.DecommissionReason = null; // Enable AD Account - if (d.DeviceDomainId != null) + if (ActiveDirectory.IsValidDomainAccountId(d.DeviceDomainId)) { var adAccount = d.ActiveDirectoryAccount(); if (adAccount != null && !adAccount.IsCriticalSystemObject)