jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix #62: DeviceDomainId may be null

Browse Source
This commit is contained in:
Gary Sharp
2014-07-15 14:57:58 +10:00
parent 09b1c93bf0
commit 4b3905b4fc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/DeviceBI/Enrol.cs
+6 -1
View File
@@ -499,7 +499,7 @@ namespace Disco.BI.DeviceBI
response.DeviceComputerName = adMachineAccount.Name; response.DeviceComputerName = adMachineAccount.Name;
response.DeviceDomainName = adMachineAccount.Domain.NetBiosName; response.DeviceDomainName = adMachineAccount.Domain.NetBiosName;
} }
else else if (ActiveDirectory.IsValidDomainAccountId(RepoDevice.DeviceDomainId))
{ {
string accountUsername; string accountUsername;
ADDomain accountDomain; ADDomain accountDomain;
@@ -508,6 +508,11 @@ namespace Disco.BI.DeviceBI
response.DeviceDomainName = accountDomain == null ? null : accountDomain.NetBiosName; response.DeviceDomainName = accountDomain == null ? null : accountDomain.NetBiosName;
response.DeviceComputerName = accountUsername; response.DeviceComputerName = accountUsername;
} }
else
{
response.DeviceDomainName = Request.DeviceDNSDomainName;
response.DeviceComputerName = Request.DeviceComputerName;
}
} }
else else
{ {