From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 12 Jul 2012 21:43:07 +0000 (+0200)
Subject: SMTP-Client: first add backups, then Relays, since we want Relays to be attempted... 
X-Git-Tag: v8.13~7
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7d57536c03742fe2ffb3bd8c96d81242dd762f42

SMTP-Client: first add backups, then Relays, since we want Relays to be attempted first.
---

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 0fa9956b0..0fa65bea2 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -817,7 +817,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	{
 		char mxbuf[SIZ];
 		ParsedURL **Url = &MyQItem->URL;
-		nRelays = get_hosts(mxbuf, "smarthost");
+		nRelays = get_hosts(mxbuf, "fallbackhost");
 		if (nRelays > 0) {
 			StrBuf *All;
 			StrBuf *One;
@@ -836,7 +836,6 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 						     ChrPtr(One));
 				}
 				else {
-					///if (!Url->IsIP)) // todo dupe me fork ipv6
 					(*Url)->IsRelay = 1;
 					MyQItem->HaveRelay = 1;
 				}
@@ -844,9 +843,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 			FreeStrBuf(&All);
 			FreeStrBuf(&One);
 		}
-
-		Url = &MyQItem->FallBackHost;
-		nRelays = get_hosts(mxbuf, "fallbackhost");
+		nRelays = get_hosts(mxbuf, "smarthost");
 		if (nRelays > 0) {
 			StrBuf *All;
 			StrBuf *One;
@@ -865,6 +862,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 						     ChrPtr(One));
 				}
 				else {
+					///if (!Url->IsIP)) // todo dupe me fork ipv6
 					(*Url)->IsRelay = 1;
 					MyQItem->HaveRelay = 1;
 				}
@@ -872,6 +870,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 			FreeStrBuf(&All);
 			FreeStrBuf(&One);
 		}
+
 	}
 
 	It = GetNewHashPos(MyQItem->MailQEntries, 0);