From c8dd5535b39519189e0110ce9a5a3062f4713a04 Mon Sep 17 00:00:00 2001 From: Hivert Quentin Date: Thu, 24 Jul 2025 15:03:30 +0200 Subject: [PATCH] =?UTF-8?q?fix(sieve=C3=A0:=20Sieve=20use=20the=20correct?= =?UTF-8?q?=20imap=20auth=20mechanism?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SoObjects/SOGo/SOGoSieveManager.m | 4 ++-- UI/SOGoUI/UIxComponent.m | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m index 2a1cc4a10..2df9c9609 100644 --- a/SoObjects/SOGo/SOGoSieveManager.m +++ b/SoObjects/SOGo/SOGoSieveManager.m @@ -790,10 +790,10 @@ static NSString *sieveScriptName = @"sogo"; imapAuthMech = nil; if([sd doesLoginTypeByDomain]) { - r = [theUsername rangeOfString: @"@"]; + r = [authname rangeOfString: @"@"]; if (r.location != NSNotFound) { - userDomain = [theUsername substringFromIndex: r.location+1]; + userDomain = [authname substringFromIndex: r.location+1]; imapAuthMech = [sd getImapAuthMechForDomain: userDomain]; } } diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index e0c0d810b..a8658e772 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -791,6 +791,7 @@ static SoProduct *commonProduct = nil; // If the action is 'connect' (or 'logoff'), we let it go as the token // needs to be created (or destroyed) during the session initialization if ([_actionName isEqualToString: @"connect"] || + [_actionName isEqualToString: @"connectName"] || [_actionName isEqualToString: @"changePassword"] || [_actionName isEqualToString: @"logoff"] || [_actionName isEqualToString: @"passwordRecovery"] ||