From b194f3853b2f9cf66714cf9e455a89cc587906f5 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 18 May 2017 08:53:13 -0400 Subject: [PATCH] deleted search fix --- src/Console/Program.cs | 3 ++- src/Core/Services/LdapDirectoryService.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Console/Program.cs b/src/Console/Program.cs index 67d6fb45..f6586d52 100644 --- a/src/Console/Program.cs +++ b/src/Console/Program.cs @@ -770,7 +770,8 @@ namespace Bit.Console Con.WriteLine("Users:"); foreach(var user in result.Users) { - Con.WriteLine(" {0}{1}", user.Email ?? user.ExternalId, user.Disabled ? " (disabled)" : null); + Con.WriteLine(" {0}{1}{2}", user.Email ?? user.ExternalId, + user.Disabled ? " (-)" : null, user.Deleted ? " (X)" : null); } } else diff --git a/src/Core/Services/LdapDirectoryService.cs b/src/Core/Services/LdapDirectoryService.cs index 96f9458e..58d9b5bb 100644 --- a/src/Core/Services/LdapDirectoryService.cs +++ b/src/Core/Services/LdapDirectoryService.cs @@ -265,7 +265,7 @@ namespace Bit.Core.Services var deletedSearcher = new DirectorySearcher(deletedEntry, deletedFilter); deletedSearcher.Tombstone = true; - var deletedResult = searcher.FindAll(); + var deletedResult = deletedSearcher.FindAll(); foreach(SearchResult item in deletedResult) { var user = BuildUser(item, true);