X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=d70e80a3f4e7e217677d587771dbcb089537f31e;hb=c1c91208257a253e65275545aea79bba4699ba09;hp=548f0b69aff395de3264254f002559db457febed;hpb=180991e8bb3d98024a93c2b25a9e757b6e9979d3;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 548f0b69a..d70e80a3f 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -153,9 +153,10 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 
 	Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-	Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem);
+	Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem, 0);
 
 	if (Msg->MyQEntry->Active && 
+	    !Msg->MyQEntry->StillActive &&
 	    CheckQEntryIsBounce(Msg->MyQEntry))
 	{
 		/* are we casue for a bounce mail? */
@@ -176,7 +177,7 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 	Msg->MyQItem->QueMsgID = -1;
 
 	if (Msg->IDestructQueItem)
-		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
+		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext, Msg->pCurrRelay);
 
 	if (Msg->nRemain > 0)
 	{
@@ -586,8 +587,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 	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,
@@ -618,8 +621,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 		/* 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);