diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2017-02-13 12:43:44 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2017-02-13 12:43:44 +0000 |
| commit | 13bb2049e8f4306c6eff193012d237ccbf1d3d3a (patch) | |
| tree | de1add1749b24d1b3c7dbb21f1072616994c46a9 /usr.sbin/smtpd | |
| parent | e7acb5080a9700c18367e3a798c31ee5b5c4db78 (diff) | |
fix incoming tls-require regression, introduced with last parse.y cleanup
causing the flag not to be propagated down to the listener
ok eric@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 9a7df4e7a49..e92a07b837b 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.194 2017/02/13 12:23:47 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.195 2017/02/13 12:43:43 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -2230,6 +2230,9 @@ config_listener(struct listener *h, struct listen_opts *lo) if (lo->ssl & F_TLS_VERIFY) h->flags |= F_TLS_VERIFY; + if (lo->ssl & F_STARTTLS_REQUIRE) + h->flags |= F_STARTTLS_REQUIRE; + if (h != conf->sc_sock_listener) TAILQ_INSERT_TAIL(conf->sc_listeners, h, entry); } |