LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(mail): add SMTP error to Exception returned by SOGOMailer

pull/284/head^2
Francis Lachapelle 2020-09-14 14:40:02 -04:00
parent 24b0408c38
commit 728a006e6e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SoObjects/SOGo/SOGoMailer.m
View File

@ -253,10 +253,9 @@
|| [login isEqualToString: @"anonymous"]
|| ![client plainAuthenticateUser: login
withPassword: password])
result = [NSException
exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) authentication failure"];
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) authentication failure"];
}
else if (authenticationType)
result = [NSException
@ -292,9 +291,8 @@
result = [self _sendMailData: mailData withClient: client];
}
else
result = [NSException
exceptionWithHTTPStatus: 500
reason: @"cannot send message: (smtp) originator not accepted"];
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message: (smtp) originator not accepted"];
}
[client quit];
[client disconnect];
@ -302,9 +300,17 @@
NS_HANDLER
{
[self errorWithFormat: @"Could not connect to the SMTP server %@", smtpServer];
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) error when connecting"];
if ([localException reason])
{
result = [NSException exceptionWithHTTPStatus: 500
reason: [localException reason]];
}
else
{
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) error when connecting"];
}
}
NS_ENDHANDLER;