diff options
| author |   henning <henning@openbsd.org> | 2015-12-02 21:10:17 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2015-12-02 21:10:17 +0000 |
| commit | 7bbb6e61d53a50b15598e62cbdb6a9b3d9a25110 (patch) | |
| tree | 1b22108f71db8b841dd5fbd08e0aec91b88e9578 /libexec/spamd | |
| parent | More rt_ifp killing. There checks in in_arpinput() to verify that the (diff) | |
| download | wireguard-openbsd-7bbb6e61d53a50b15598e62cbdb6a9b3d9a25110.tar.xz wireguard-openbsd-7bbb6e61d53a50b15598e62cbdb6a9b3d9a25110.zip | |
in response to EHLO, don't offer STARTTLS if we already completed the
STARTTLS dance. ok millert
Diffstat (limited to 'libexec/spamd')
| -rw-r--r-- | libexec/spamd/spamd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c index 7a9bdc8333f..65b81daab3c 100644 --- a/libexec/spamd/spamd.c +++ b/libexec/spamd/spamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd.c,v 1.132 2015/12/02 20:58:43 henning Exp $ */ +/* $OpenBSD: spamd.c,v 1.133 2015/12/02 21:10:17 henning Exp $ */ /* * Copyright (c) 2015 Henning Brauer <henning@openbsd.org> @@ -831,7 +831,8 @@ nextstate(struct con *cp) snprintf(cp->obuf, cp->osize, "501 helo requires domain name.\r\n"); } else { - if (tlsctx != NULL && cp->blacklists == NULL && + if (cp->cctx == NULL && tlsctx != NULL && + cp->blacklists == NULL && match(cp->ibuf, "EHLO")) { snprintf(cp->obuf, cp->osize, "250 STARTTLS\r\n"); |