summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/mta_session.c
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2014-07-04 13:25:01 +0000
committerEric Faurot <eric@cvs.openbsd.org>2014-07-04 13:25:01 +0000
commitaabcd230ec3c51ce09daf87973025f1f61a9bea1 (patch)
tree25bc7d04f324ecc171744142dfa640c512fba1f7 /usr.sbin/smtpd/mta_session.c
parentba689310060ce0abe3599f5307ea3e19c4fd1919 (diff)
always attempt to use tls for relaying to the primary server when
acting as a backup mx. reported by otto@. ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/mta_session.c')
-rw-r--r--usr.sbin/smtpd/mta_session.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c
index 4077d675e7f..8d85ccf0a2c 100644
--- a/usr.sbin/smtpd/mta_session.c
+++ b/usr.sbin/smtpd/mta_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta_session.c,v 1.66 2014/05/20 18:47:01 eric Exp $ */
+/* $OpenBSD: mta_session.c,v 1.67 2014/07/04 13:25:00 eric Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -220,6 +220,9 @@ mta_session(struct mta_relay *relay, struct mta_route *route)
s->flags |= MTA_FORCE_PLAIN;
}
+ if (relay->flags & RELAY_BACKUP)
+ s->flags &= ~MTA_FORCE_PLAIN;
+
log_debug("debug: mta: %p: spawned for relay %s", s,
mta_relay_to_text(relay));
stat_increment("mta.session", 1);