projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SMTPClient: when relaying with users/email addresses fail with an aidemessage if...
[citadel.git]
/
citadel
/
modules
/
smtp
/
serv_smtpeventclient.c
diff --git
a/citadel/modules/smtp/serv_smtpeventclient.c
b/citadel/modules/smtp/serv_smtpeventclient.c
index f1901a99641401b044cda0f74451c7b3b7c08fcd..d70e80a3f4e7e217677d587771dbcb089537f31e 100644
(file)
--- a/
citadel/modules/smtp/serv_smtpeventclient.c
+++ b/
citadel/modules/smtp/serv_smtpeventclient.c
@@
-587,8
+587,10
@@
void smtp_try_one_queue_entry(OneQueItem *MyQItem,
if (KeepMsgText) Msg->msgtext = MsgText;
else Msg->msgtext = NewStrBufDup(MsgText);
if (KeepMsgText) Msg->msgtext = MsgText;
else Msg->msgtext = NewStrBufDup(MsgText);
- if (smtp_resolve_recipients(Msg)) {
-
+ if (((!MyQItem->HaveRelay ||
+ (MyQItem->URL != NULL)) &&
+ smtp_resolve_recipients(Msg)))
+ {
safestrncpy(
((CitContext *)Msg->IO.CitContext)->cs_host,
Msg->node,
safestrncpy(
((CitContext *)Msg->IO.CitContext)->cs_host,
Msg->node,
@@
-619,8
+621,9
@@
void smtp_try_one_queue_entry(OneQueItem *MyQItem,
/* No recipients? well fail then. */
if (Msg->MyQEntry != NULL) {
Msg->MyQEntry->Status = 5;
/* No recipients? well fail then. */
if (Msg->MyQEntry != NULL) {
Msg->MyQEntry->Status = 5;
- StrBufPlain(Msg->MyQEntry->StatusMessage,
- HKEY("Invalid Recipient!"));
+ if (StrLength(Msg->MyQEntry->StatusMessage) == 0)
+ StrBufPlain(Msg->MyQEntry->StatusMessage,
+ HKEY("Invalid Recipient!"));
}
FinalizeMessageSend_DB(&Msg->IO);
DeleteSmtpOutMsg(&Msg->IO);
}
FinalizeMessageSend_DB(&Msg->IO);
DeleteSmtpOutMsg(&Msg->IO);