X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=94c075be0238cf696d562d1372dd872332c8c556;hb=40170e6219348ea235429a4c830b54bc8a16eed3;hp=9c51a1bc5bce10831681eaf86c6388609934b40a;hpb=e77095734a9b355c27d3e1378498b2c92b4a828d;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 9c51a1bc5..94c075be0 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -129,7 +129,7 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 	int nRemain;
 	StrBuf *MsgData;
 	AsyncIO *IO = &Msg->IO;
-	EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 
 	IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
@@ -486,6 +486,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 		SubC->session_specific_data = (char*) SendMsg;
 		SendMsg->IO.CitContext = SubC;
 
+		syslog(LOG_DEBUG, "SMTP Starting: [%ld] \n",
+		       SendMsg->MyQItem->MessageID, 
+		       ChrPtr(SendMsg->MyQEntry->Recipient));
 		if (SendMsg->pCurrRelay == NULL)
 			QueueEventContext(&SendMsg->IO,
 					  resolve_mx_records);
@@ -568,8 +571,11 @@ eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 	eNextState rc;
 
 	rc = ReadHandlers[pMsg->State](pMsg);
-	pMsg->State++;
-	SMTPSetTimeout(rc, pMsg);
+	if (rc != eAbort)
+	{
+		pMsg->State++;
+		SMTPSetTimeout(rc, pMsg);
+	}
 	return rc;
 }
 eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)