git » chasquid » commit a016d78

diff --git a/internal/courier/smtp.go b/internal/courier/smtp.go
index ebb2ce7..7f1ce25 100644
--- a/internal/courier/smtp.go
+++ b/internal/courier/smtp.go
@@ -43,11 +43,12 @@ type SMTP struct {
 
 func (s *SMTP) Deliver(from string, to string, data []byte) (error, bool) {
 	a := &attempt{
-		courier: s,
-		from:    from,
-		to:      to,
-		data:    data,
-		tr:      trace.New("Courier.SMTP", to),
+		courier:  s,
+		from:     from,
+		to:       to,
+		toDomain: envelope.DomainOf(to),
+		data:     data,
+		tr:       trace.New("Courier.SMTP", to),
 	}
 	defer a.tr.Finish()
 	a.tr.Debugf("%s  ->  %s", from, to)
@@ -57,8 +58,7 @@ func (s *SMTP) Deliver(from string, to string, data []byte) (error, bool) {
 		a.from = ""
 	}
 
-	toDomain := envelope.DomainOf(to)
-	mxs, err := lookupMXs(a.tr, toDomain)
+	mxs, err := lookupMXs(a.tr, a.toDomain)
 	if err != nil || len(mxs) == 0 {
 		// Note this is considered a permanent error.
 		// This is in line with what other servers (Exim) do. However, the
@@ -163,7 +163,7 @@ retry:
 		a.tr.Debugf("Insecure - NOT using TLS")
 	}
 
-	if a.toDomain != "" && !a.courier.Dinfo.OutgoingSecLevel(a.toDomain, secLevel) {
+	if !a.courier.Dinfo.OutgoingSecLevel(a.toDomain, secLevel) {
 		// We consider the failure transient, so transient misconfigurations
 		// do not affect deliveries.
 		slcResults.Add("fail", 1)
diff --git a/test/t-09-loop/run.sh b/test/t-09-loop/run.sh
index efddcb7..24fbca4 100755
--- a/test/t-09-loop/run.sh
+++ b/test/t-09-loop/run.sh
@@ -41,4 +41,12 @@ while sleep 0.1; do
 	fi
 done
 
+# Test that A has outgoing domaininfo for srv-b.
+# This is unrelated to the loop itself, but serves as an end-to-end
+# verification that outgoing domaininfo works.
+if ! grep -q "outgoing_sec_level: TLS_INSECURE" ".data-A/domaininfo/s:srv-b";
+then
+	fail "A is missing the domaininfo for srv-b"
+fi
+
 success