bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-28 22:23:45 +00:00
Code Issues Releases Wiki Activity

control fix

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-17 22:22:46 -04:00
parent 9c3f5a8e6b
commit 357c4e6576
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Core/Services/LdapDirectoryService.cs
View File

@@ -93,8 +93,8 @@ namespace Bit.Core.Services
SettingsService.Instance.LastGroupSyncDate.HasValue;
if(searchSinceRevision)
{
filter = string.Format("(&{0}({1}>{2}))",
filter != null ? string.Format("({0})", filter) : string.Empty,
filter = string.Format("(&{0}({1}>={2}))",
filter,
SettingsService.Instance.Sync.RevisionDateAttribute,
SettingsService.Instance.LastGroupSyncDate.Value.ToGeneralizedTimeUTC());
}
@@ -249,8 +249,8 @@ namespace Bit.Core.Services
if(!force && !string.IsNullOrWhiteSpace(SettingsService.Instance.Sync.RevisionDateAttribute) &&
SettingsService.Instance.LastUserSyncDate.HasValue)
{
filter = string.Format("(&{0}({1}>{2}))",
filter != null ? string.Format("({0})", filter) : string.Empty,
filter = string.Format("(&{0}({1}>={2}))",
filter,
SettingsService.Instance.Sync.RevisionDateAttribute,
SettingsService.Instance.LastUserSyncDate.Value.ToGeneralizedTimeUTC());
}
@@ -273,8 +273,7 @@ namespace Bit.Core.Services
// Deleted users
if(SettingsService.Instance.Server.Type == DirectoryType.ActiveDirectory)
{
filter = string.Format("(&{0}(isDeleted=TRUE))",
filter != null ? string.Format("({0})", filter) : string.Empty);
filter = string.Format("(&{0}(isDeleted=TRUE))", filter);
searcher = new DirectorySearcher(entry, filter);
searcher.Tombstone = true;
@@ -350,13 +349,13 @@ namespace Bit.Core.Services
private static bool EntryDisabled(SearchResult item)
{
if(!item.Properties.Contains("userAccountControl"))
if(!item.Properties.Contains("userAccountControl") || item.Properties["userAccountControl"].Count == 0)
{
return false;
}
UserAccountControl control;
if(!Enum.TryParse(item.Properties["userAccountControl"].ToString(), out control))
if(!Enum.TryParse(item.Properties["userAccountControl"][0].ToString(), out control))
{
return false;
}