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

Use AD site-servers where possible

Browse Source
This commit is contained in:
Gary Sharp
2014-04-17 17:37:59 +10:00
parent b8ec44293f
commit 43fc622121
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Interop/ActiveDirectory/Internal/ADInterop.cs
+20 -2
View File
@@ -445,7 +445,19 @@ namespace Disco.Services.Interop.ActiveDirectory.Internal
private static IEnumerable<ActiveDirectorySearchResult> SearchDomain(ActiveDirectoryDomain Domain, DomainController DomainController, string SearchRoot, string LdapFilter, int? ResultLimit, string[] LoadProperties) private static IEnumerable<ActiveDirectorySearchResult> SearchDomain(ActiveDirectoryDomain Domain, DomainController DomainController, string SearchRoot, string LdapFilter, int? ResultLimit, string[] LoadProperties)
{ {
string ldapServer = DomainController == null ? Domain.DnsName : DomainController.Name; string ldapServer;
if (DomainController != null)
{
ldapServer = DomainController.Name;
}
else
{
var domainDC = Site.RetrieveReachableDomainControllers(Domain).FirstOrDefault();
if (domainDC != null)
ldapServer = domainDC.Name;
else
ldapServer = Domain.DnsName;
}
string searchRoot = SearchRoot ?? Domain.DistinguishedName; string searchRoot = SearchRoot ?? Domain.DistinguishedName;
string ldapPath = string.Format(@"LDAP://{0}/{1}", ldapServer, searchRoot); string ldapPath = string.Format(@"LDAP://{0}/{1}", ldapServer, searchRoot);
@@ -551,9 +563,15 @@ namespace Disco.Services.Interop.ActiveDirectory.Internal
// Find Domain // Find Domain
var domain = GetDomainByDistinguishedName(DistinguishedName); var domain = GetDomainByDistinguishedName(DistinguishedName);
if (domain == null)
throw new ArgumentException(string.Format("Unknown domain for DistinguishedName: {0}", DistinguishedName), "DistinguishedName");
var domainDC = Site.RetrieveReachableDomainControllers(domain).FirstOrDefault();
var ldapServer = domainDC != null ? domainDC.Name : domain.DnsName;
Domain = domain; Domain = domain;
return new DirectoryEntry(string.Format(@"LDAP://{0}/{1}", domain.DnsName, DistinguishedName)); return new DirectoryEntry(string.Format(@"LDAP://{0}/{1}", ldapServer, DistinguishedName));
} }
public static DomainController RetrieveWritableDomainController(this ActiveDirectoryDomain domain) public static DomainController RetrieveWritableDomainController(this ActiveDirectoryDomain domain)