summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2018-10-31 15:13:22 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2018-10-31 15:13:22 +0000
commit0f55a7a9be8b726b3fcb755f443b5bd0f82e4067 (patch)
tree436914f4e07cf33c22e654c7725f619b556b10b1 /usr.sbin
parentad300ef20a5ac4a972b3c0f56000246c6657b9a3 (diff)
log tls events as "tls" not "starttls" it has confused people
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/mta_session.c4
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c
index f59757b5a02..644cac17003 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.112 2018/09/20 10:22:14 eric Exp $ */
+/* $OpenBSD: mta_session.c,v 1.113 2018/10/31 15:13:21 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -1158,7 +1158,7 @@ mta_io(struct io *io, int evt, void *arg)
break;
case IO_TLSREADY:
- log_info("%016"PRIx64" mta starttls ciphers=%s",
+ log_info("%016"PRIx64" mta tls ciphers=%s",
s->id, ssl_to_text(io_ssl(s->io)));
s->flags |= MTA_TLS;
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 64323eae183..e386106c841 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.337 2018/09/03 19:01:29 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.338 2018/10/31 15:13:21 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -910,7 +910,7 @@ smtp_io(struct io *io, int evt, void *arg)
switch (evt) {
case IO_TLSREADY:
- log_info("%016"PRIx64" smtp starttls address=%s host=%s ciphers=\"%s\"",
+ log_info("%016"PRIx64" smtp tls address=%s host=%s ciphers=\"%s\"",
s->id, ss_to_text(&s->ss), s->hostname, ssl_to_text(io_ssl(s->io)));
s->flags |= SF_SECURE;