From ca036c55ed77a65dd706655129dbd33ac374b6f2 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 16 May 2017 00:13:38 -0400 Subject: [PATCH] dont skip empty email if user is disabled --- src/Core/Services/LdapDirectoryService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Core/Services/LdapDirectoryService.cs b/src/Core/Services/LdapDirectoryService.cs index 6063e39a..f7caa3cc 100644 --- a/src/Core/Services/LdapDirectoryService.cs +++ b/src/Core/Services/LdapDirectoryService.cs @@ -201,6 +201,8 @@ namespace Bit.Core.Services continue; } + user.Disabled = EntryDisabled(item); + // Email if(SettingsService.Instance.Sync.EmailPrefixSuffix && item.Properties.Contains(SettingsService.Instance.Sync.UserEmailPrefixAttribute) && @@ -218,7 +220,7 @@ namespace Bit.Core.Services .ToString() .ToLowerInvariant(); } - else + else if(!user.Disabled) { continue; } @@ -226,8 +228,6 @@ namespace Bit.Core.Services // Dates user.CreationDate = item.Properties.ParseDateTime(SettingsService.Instance.Sync.CreationDateAttribute); user.RevisionDate = item.Properties.ParseDateTime(SettingsService.Instance.Sync.RevisionDateAttribute); - - user.Disabled = EntryDisabled(item); } return Task.FromResult(users);