mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-15 00:17:15 +00:00
(fix) avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES
This commit is contained in:
1 parent
e2ef0103c4
commit
f4963df50f
3 files changed
+8
-4
No files matched your search
@@ -228,7 +228,8 @@
|
||||
if ([domain isNotNull])
|
||||
{
|
||||
sd = [SOGoSystemDefaults sharedSystemDefaults];
|
||||
if ([sd enableDomainBasedUID])
|
||||
if ([sd enableDomainBasedUID] &&
|
||||
[username rangeOfString: @"@"].location == NSNotFound)
|
||||
username = [NSString stringWithFormat: @"%@@%@", username, domain];
|
||||
}
|
||||
|
||||
@@ -587,7 +588,8 @@
|
||||
if ([domain isNotNull])
|
||||
{
|
||||
sd = [SOGoSystemDefaults sharedSystemDefaults];
|
||||
if ([sd enableDomainBasedUID])
|
||||
if ([sd enableDomainBasedUID] &&
|
||||
[username rangeOfString: @"@"].location == NSNotFound)
|
||||
username = [NSString stringWithFormat: @"%@@%@", username, domain];
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user