From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 5 Aug 2012 13:18:30 +0000 (+0200)
Subject: SMTP-Client: first evaluate the recipients, so we have them set properly on bail... 
X-Git-Tag: v8.20~270
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=07083a4cffdc94eeb1e531c7315335e04b8ae135

SMTP-Client: first evaluate the recipients, so we have them set properly on bail out.
---

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index fbcf67c2c..abacc906f 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -587,9 +587,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 	if (KeepMsgText) Msg->msgtext = MsgText;
 	else		 Msg->msgtext = NewStrBufDup(MsgText);
 
-	if (((!MyQItem->HaveRelay ||
-	      (MyQItem->URL != NULL)) &&
-	     smtp_resolve_recipients(Msg)))
+	if (smtp_resolve_recipients(Msg) &&
+	    (!MyQItem->HaveRelay ||
+	     (MyQItem->URL != NULL)))
 	{
 		safestrncpy(
 			((CitContext *)Msg->IO.CitContext)->cs_host,