diff options
| author |   gilles <gilles@openbsd.org> | 2015-12-13 10:33:42 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2015-12-13 10:33:42 +0000 |
| commit | 21853f17dac7e95e6830280062c2dc8924323cf5 (patch) | |
| tree | ccf665d99a24321233b68a675eb48317783cadbc | |
| parent | document wildcard pki/ca (diff) | |
| download | wireguard-openbsd-21853f17dac7e95e6830280062c2dc8924323cf5.tar.xz wireguard-openbsd-21853f17dac7e95e6830280062c2dc8924323cf5.zip | |
remove prototype to now unused function + pass fallback hint to lka
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 99fc6c542fd..338e49fbb3b 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.260 2015/12/13 09:52:44 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.261 2015/12/13 10:33:42 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -189,7 +189,6 @@ static int smtp_verify_certificate(struct smtp_session *); static uint8_t dsn_notify_str_to_uint8(const char *); static void smtp_auth_failure_pause(struct smtp_session *); static void smtp_auth_failure_resume(int, short, void *); -static const char *smtp_sni_get_servername(struct smtp_session *); static void smtp_filter_connect(struct smtp_session *, struct sockaddr *); static void smtp_filter_rset(struct smtp_session *); @@ -1346,12 +1345,17 @@ smtp_io(struct io *io, int evt) /* Wait for the client to start tls */ if (s->state == STATE_TLS) { req_ca_cert.reqid = s->id; - if (s->listener->pki_name[0]) + + if (s->listener->pki_name[0]) { (void)strlcpy(req_ca_cert.name, s->listener->pki_name, sizeof req_ca_cert.name); - else + req_ca_cert.fallback = 0; + } + else { (void)strlcpy(req_ca_cert.name, s->smtpname, sizeof req_ca_cert.name); + req_ca_cert.fallback = 1; + } m_compose(p_lka, IMSG_SMTP_TLS_INIT, 0, 0, -1, &req_ca_cert, sizeof(req_ca_cert)); tree_xset(&wait_ssl_init, s->id, s); |