X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=af5d12d9467328f4ac9f2bb51fb32b07efcbd2a0;hb=cf7cb2463d47a4a9ed36c8d1c13f188418389437;hp=efc274d37716515d52624095066b4b9f1527d3b5;hpb=7b6191e9787496d0a3157637414210832e68117b;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index efc274d37..af5d12d94 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -264,10 +264,10 @@ eNextState mx_connect_ip(AsyncIO *IO)
 
 	SetConnectStatus(IO);
 
-	return InitEventIO(IO, SendMsg, 
-			   SMTP_C_ConnTimeout, 
-			   SMTP_C_ReadTimeouts[0],
-			   1);
+	return EvConnectSock(IO, SendMsg, 
+			     SMTP_C_ConnTimeout, 
+			     SMTP_C_ReadTimeouts[0],
+			     1);
 }
 
 eNextState get_one_mx_host_ip_done(AsyncIO *IO)
@@ -361,13 +361,13 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 	while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
 		pp = &(*pp)->Next;
 
-	if ((IO->DNSQuery->DNSStatus == ARES_SUCCESS) && 
-	    (IO->DNSQuery->VParsedDNSReply != NULL))
+	if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) && 
+	    (IO->DNS.Query->VParsedDNSReply != NULL))
 	{ /* ok, we found mx records. */
 		SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage;
 		
 		SendMsg->CurrMX    = SendMsg->AllMX 
-			           = IO->DNSQuery->VParsedDNSReply;
+			           = IO->DNS.Query->VParsedDNSReply;
 		while (SendMsg->CurrMX) {
 			int i;
 			for (i = 0; i < 2; i++) {
@@ -457,7 +457,7 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
 	SendMsg->IO.Terminate     = SMTP_C_Terminate;
 	SendMsg->IO.LineReader    = SMTP_C_ReadServerStatus;
 	SendMsg->IO.ConnFail      = SMTP_C_ConnFail;
-	SendMsg->IO.DNSFail       = SMTP_C_DNSFail;
+	SendMsg->IO.DNS.Fail      = SMTP_C_DNSFail;
 	SendMsg->IO.Timeout       = SMTP_C_Timeout;
 	SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown;