From 74df073b29fe7eb0dcc12165045b800d0c67dd85 Mon Sep 17 00:00:00 2001
From: Gary Sharp <discoict@outlook.com>
Date: Tue, 22 Apr 2014 10:12:03 +1000
Subject: [PATCH] Bug Fix: AD User Searching

Group properties were loaded instead of User properties
---
 Disco.Services/Disco.Services.csproj                      | 8 +-------
 Disco.Services/Interop/ActiveDirectory/ActiveDirectory.cs | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Disco.Services/Disco.Services.csproj b/Disco.Services/Disco.Services.csproj
index 42f951c6..ba8f4f8e 100644
--- a/Disco.Services/Disco.Services.csproj
+++ b/Disco.Services/Disco.Services.csproj
@@ -174,12 +174,6 @@
     <Compile Include="Authorization\Roles\RoleToken.cs" />
     <Compile Include="Extensions\DateTimeExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
-    <None Include="Interop\_ActiveDirectory\ActiveDirectory.cs" />
-    <None Include="Interop\_ActiveDirectory\ActiveDirectoryExtensions.cs" />
-    <None Include="Interop\_ActiveDirectory\Internal\ADDiscoverForestServers.cs" />
-    <None Include="Interop\_ActiveDirectory\Internal\ADGroupCache.cs" />
-    <None Include="Interop\_ActiveDirectory\Internal\ADInterop.cs" />
-    <None Include="Interop\_ActiveDirectory\Internal\ADUpdateLastNetworkLogonDateJob.cs" />
     <Compile Include="Interop\ActiveDirectory\ActiveDirectory.cs" />
     <Compile Include="Interop\ActiveDirectory\ActiveDirectoryContext.cs" />
     <Compile Include="Interop\ActiveDirectory\ActiveDirectoryExtensions.cs" />
@@ -303,7 +297,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
diff --git a/Disco.Services/Interop/ActiveDirectory/ActiveDirectory.cs b/Disco.Services/Interop/ActiveDirectory/ActiveDirectory.cs
index 40302a34..df8accc4 100644
--- a/Disco.Services/Interop/ActiveDirectory/ActiveDirectory.cs
+++ b/Disco.Services/Interop/ActiveDirectory/ActiveDirectory.cs
@@ -85,9 +85,9 @@ namespace Disco.Services.Interop.ActiveDirectory
 
             IEnumerable<ADSearchResult> searchResults;
             if (searchDomain != null)
-                searchResults = searchDomain.SearchScope(ldapFilter, ADGroup.LoadProperties, ResultLimit);
+                searchResults = searchDomain.SearchScope(ldapFilter, ADUserAccount.LoadProperties, ResultLimit);
             else
-                searchResults = Context.SearchScope(ldapFilter, ADGroup.LoadProperties, ResultLimit);
+                searchResults = Context.SearchScope(ldapFilter, ADUserAccount.LoadProperties, ResultLimit);
 
             return searchResults.Select(result => result.AsADUserAccount(Quick, AdditionalProperties));
         }