diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2014-02-17 11:06:55 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2014-02-17 11:06:55 +0000 |
| commit | 60279ba1f9b29032ad450e334f00729907304fff (patch) | |
| tree | 57596e3a83a960e753743a03fe07dfbe177d0bb9 | |
| parent | 57a922aed6cea928b5ed9a94c1c637b91a6b22a5 (diff) | |
do not lookup pki based on hostname if one was specified for the listener
otherwise we may fail to find it and reject client.
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 513d4a3544a..c47f7d3c692 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.195 2014/02/04 15:44:05 eric Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.196 2014/02/17 11:06:54 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -667,8 +667,12 @@ smtp_mfa_response(struct smtp_session *s, int status, uint32_t code, if (s->listener->flags & F_SMTPS) { req_ca_cert.reqid = s->id; - strlcpy(req_ca_cert.name, s->smtpname, - sizeof req_ca_cert.name); + if (s->listener->pki_name[0]) + strlcpy(req_ca_cert.name, s->listener->pki_name, + sizeof req_ca_cert.name); + else + strlcpy(req_ca_cert.name, s->smtpname, + sizeof req_ca_cert.name); m_compose(p_lka, IMSG_LKA_SSL_INIT, 0, 0, -1, &req_ca_cert, sizeof(req_ca_cert)); tree_xset(&wait_ssl_init, s->id, s); @@ -914,8 +918,12 @@ 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; - strlcpy(req_ca_cert.name, s->smtpname, - sizeof req_ca_cert.name); + if (s->listener->pki_name[0]) + strlcpy(req_ca_cert.name, s->listener->pki_name, + sizeof req_ca_cert.name); + else + strlcpy(req_ca_cert.name, s->smtpname, + sizeof req_ca_cert.name); m_compose(p_lka, IMSG_LKA_SSL_INIT, 0, 0, -1, &req_ca_cert, sizeof(req_ca_cert)); tree_xset(&wait_ssl_init, s->id, s); |