From ee68d85956c832a347b4fdf29231c836314b6cbd Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 4 Sep 2018 17:19:00 +0000 Subject: [PATCH] remove useless session flag ok gilles@ --- usr.sbin/smtpd/mta_session.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c index 02de77ea411..27b69c52a66 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.107 2018/09/04 10:08:22 eric Exp $ */ +/* $OpenBSD: mta_session.c,v 1.108 2018/09/04 17:19:00 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard @@ -80,7 +80,6 @@ enum mta_state { #define MTA_FORCE_TLS 0x0004 #define MTA_FORCE_PLAIN 0x0008 #define MTA_WANT_SECURE 0x0010 -#define MTA_USE_AUTH 0x0020 #define MTA_DOWNGRADE_PLAIN 0x0080 #define MTA_TLS 0x0100 @@ -198,8 +197,6 @@ mta_session(struct mta_relay *relay, struct mta_route *route) s->relay = relay; s->route = route; - if (relay->flags & RELAY_SSL && relay->flags & RELAY_AUTH) - s->flags |= MTA_USE_AUTH; if (relay->flags & RELAY_LMTP) s->flags |= MTA_LMTP; switch (relay->flags & (RELAY_SSL|RELAY_TLS_OPTIONAL)) { @@ -899,7 +896,7 @@ mta_response(struct mta_session *s, char *line) case MTA_EHLO: if (line[0] != '2') { /* rejected at ehlo state */ - if ((s->flags & MTA_USE_AUTH) || + if ((s->relay->flags & RELAY_AUTH) || (s->flags & MTA_WANT_SECURE)) { mta_error(s, "EHLO rejected: %s", line); s->flags |= MTA_FREE; -- 2.20.1