diff options
-rw-r--r-- | smtpd/CVS/Entries | 176 | ||||
-rw-r--r-- | smtpd/limit.c | 6 | ||||
-rw-r--r-- | smtpd/smtp_session.c | 14 | ||||
-rw-r--r-- | smtpd/smtpctl.8 | 6 |
4 files changed, 101 insertions, 101 deletions
diff --git a/smtpd/CVS/Entries b/smtpd/CVS/Entries index 0b1bb7ad..2f97af65 100644 --- a/smtpd/CVS/Entries +++ b/smtpd/CVS/Entries @@ -1,90 +1,90 @@ D/smtpctl//// D/smtpd//// -/Makefile/1.15/Mon Mar 7 16:27:28 2016// -/aliases.5/1.12/Mon Mar 7 16:27:28 2016// -/forward.5/1.9/Mon Mar 7 16:27:28 2016// -/iobuf.h/1.4/Mon Mar 7 16:27:28 2016// -/ioev.h/1.6/Wed May 18 07:36:31 2016// -/makemap.8/1.29/Mon Mar 7 16:27:28 2016// -/newaliases.8/1.11/Mon Mar 7 16:27:28 2016// -/parser.h/1.29/Mon Mar 7 16:27:28 2016// -/rfc2822.h/1.4/Mon Mar 7 16:27:28 2016// -/sendmail.8/1.4/Mon Mar 7 16:27:28 2016// -/smtpd-api.h/1.29/Mon Mar 7 16:27:28 2016// -/smtpd.8/1.30/Wed May 18 07:36:31 2016// -/table.5/1.5/Mon Mar 7 16:27:28 2016// -/smtpctl.8/1.56/Sun Jun 5 12:06:51 2016// -/aliases.c/1.70/Tue Jun 7 06:53:08 2016// -/bounce.c/1.72/Tue Jun 7 06:53:08 2016// -/ca.c/1.22/Tue Jun 7 06:53:08 2016// -/compress_backend.c/1.9/Tue Jun 7 06:53:08 2016// -/compress_gzip.c/1.10/Tue Jun 7 06:53:08 2016// -/config.c/1.35/Tue Jun 7 06:53:08 2016// -/control.c/1.113/Tue Jun 7 06:53:08 2016// -/crypto.c/1.5/Tue Jun 7 06:53:08 2016// -/delivery.c/1.6/Tue Jun 7 06:53:08 2016// -/delivery_filename.c/1.14/Tue Jun 7 06:53:08 2016// -/delivery_lmtp.c/1.17/Tue Jun 7 06:53:08 2016// -/delivery_maildir.c/1.17/Tue Jun 7 06:53:08 2016// -/delivery_mbox.c/1.12/Tue Jun 7 06:53:08 2016// -/delivery_mda.c/1.9/Tue Jun 7 06:53:08 2016// -/dict.c/1.5/Tue Jun 7 06:53:08 2016// -/dns.c/1.83/Tue Jun 7 06:53:08 2016// -/enqueue.c/1.112/Tue Jun 7 06:53:08 2016// -/envelope.c/1.36/Tue Jun 7 06:53:08 2016// -/esc.c/1.4/Tue Jun 7 06:53:08 2016// -/expand.c/1.29/Tue Jun 7 06:53:08 2016// -/filter.c/1.18/Tue Jun 7 06:53:08 2016// -/forward.c/1.39/Tue Jun 7 06:53:08 2016// -/iobuf.c/1.9/Tue Jun 7 06:53:08 2016// -/ioev.c/1.26/Tue Jun 7 06:53:08 2016// -/limit.c/1.4/Tue Jun 7 06:53:08 2016// -/lka.c/1.193/Tue Jun 7 06:53:08 2016// -/lka_session.c/1.79/Tue Jun 7 06:53:08 2016// -/log.c/1.17/Tue Jun 7 06:53:08 2016// -/log.h/1.5/Tue Jun 7 06:53:08 2016// -/mailaddr.c/1.2/Tue Jun 7 06:53:08 2016// -/makemap.c/1.65/Tue Jun 7 06:53:08 2016// -/mda.c/1.119/Tue Jun 7 06:53:08 2016// -/mproc.c/1.20/Tue Jun 7 06:53:08 2016// -/mta.c/1.201/Tue Jun 7 06:53:08 2016// -/mta_session.c/1.83/Tue Jun 7 06:53:08 2016// -/parse.y/1.184/Tue Jun 7 06:53:08 2016// -/parser.c/1.40/Tue Jun 7 06:53:08 2016// -/pony.c/1.13/Tue Jun 7 06:53:08 2016// -/queue.c/1.178/Tue Jun 7 06:53:08 2016// -/queue_backend.c/1.62/Tue Jun 7 06:53:08 2016// -/queue_fs.c/1.14/Tue Jun 7 06:53:08 2016// -/queue_null.c/1.6/Tue Jun 7 06:53:08 2016// -/queue_proc.c/1.6/Tue Jun 7 06:53:08 2016// -/queue_ram.c/1.7/Tue Jun 7 06:53:08 2016// -/rfc2822.c/1.7/Tue Jun 7 06:53:08 2016// -/ruleset.c/1.32/Tue Jun 7 06:53:08 2016// -/runq.c/1.2/Tue Jun 7 06:53:08 2016// -/scheduler.c/1.52/Tue Jun 7 06:53:08 2016// -/scheduler_backend.c/1.15/Tue Jun 7 06:53:08 2016// -/scheduler_null.c/1.9/Tue Jun 7 06:53:08 2016// -/scheduler_proc.c/1.8/Tue Jun 7 06:53:08 2016// -/scheduler_ramqueue.c/1.42/Tue Jun 7 06:53:08 2016// -/smtp.c/1.155/Tue Jun 7 06:53:08 2016// -/smtp_session.c/1.272/Tue Jun 7 06:53:08 2016// -/smtpctl.c/1.149/Tue Jun 7 06:53:08 2016// -/smtpd-defines.h/1.6/Tue Jun 7 06:53:08 2016// -/smtpd.conf.5/1.161/Tue Jun 7 06:53:08 2016// -/smtpd.h/1.515/Tue Jun 7 06:53:08 2016// -/ssl.c/1.86/Tue Jun 7 06:53:08 2016// -/ssl.h/1.20/Tue Jun 7 06:53:08 2016// -/ssl_smtpd.c/1.13/Tue Jun 7 06:53:08 2016// -/stat_backend.c/1.10/Tue Jun 7 06:53:08 2016// -/stat_ramstat.c/1.10/Tue Jun 7 06:53:08 2016// -/table.c/1.23/Tue Jun 7 06:53:08 2016// -/table_api.c/1.8/Tue Jun 7 06:53:08 2016// -/table_db.c/1.9/Tue Jun 7 06:53:08 2016// -/table_getpwnam.c/1.4/Tue Jun 7 06:53:08 2016// -/table_proc.c/1.6/Tue Jun 7 06:53:08 2016// -/table_static.c/1.15/Tue Jun 7 06:53:08 2016// -/to.c/1.28/Tue Jun 7 06:53:08 2016// -/tree.c/1.5/Tue Jun 7 06:53:08 2016// -/util.c/1.127/Tue Jun 7 06:53:08 2016// -/waitq.c/1.5/Tue Jun 7 06:53:08 2016// -/smtpd.c/1.278/Tue Jun 7 06:54:45 2016// +/Makefile/1.15/Sun May 8 15:40:28 2016// +/aliases.5/1.12/Sun May 8 15:40:28 2016// +/aliases.c/1.70/Wed Jun 15 19:59:40 2016// +/bounce.c/1.72/Wed Jun 15 19:59:40 2016// +/ca.c/1.22/Wed Jun 15 19:59:43 2016// +/compress_backend.c/1.9/Wed Jun 15 19:59:40 2016// +/compress_gzip.c/1.10/Wed Jun 15 19:59:40 2016// +/config.c/1.35/Wed Jun 15 19:59:43 2016// +/control.c/1.113/Wed Jun 15 19:59:43 2016// +/crypto.c/1.5/Wed Jun 15 19:59:40 2016// +/delivery.c/1.6/Wed Jun 15 19:59:40 2016// +/delivery_filename.c/1.14/Wed Jun 15 19:59:40 2016// +/delivery_lmtp.c/1.17/Wed Jun 15 19:59:43 2016// +/delivery_maildir.c/1.17/Wed Jun 15 19:59:40 2016// +/delivery_mbox.c/1.12/Wed Jun 15 19:59:40 2016// +/delivery_mda.c/1.9/Wed Jun 15 19:59:40 2016// +/dict.c/1.5/Wed Jun 15 19:59:40 2016// +/dns.c/1.83/Wed Jun 15 19:59:40 2016// +/enqueue.c/1.112/Wed Jun 15 19:59:40 2016// +/envelope.c/1.36/Wed Jun 15 19:59:40 2016// +/esc.c/1.4/Wed Jun 15 19:59:40 2016// +/expand.c/1.29/Wed Jun 15 19:59:40 2016// +/filter.c/1.18/Wed Jun 15 19:59:40 2016// +/forward.5/1.9/Sun May 8 15:40:28 2016// +/forward.c/1.39/Wed Jun 15 19:59:40 2016// +/iobuf.c/1.9/Wed Jun 15 19:59:40 2016// +/iobuf.h/1.4/Sun May 8 15:40:28 2016// +/ioev.c/1.26/Wed Jun 15 19:59:40 2016// +/ioev.h/1.6/Sun May 8 16:37:15 2016// +/limit.c/1.5/Wed Jun 15 20:00:30 2016// +/lka.c/1.193/Wed Jun 15 19:59:43 2016// +/lka_session.c/1.79/Wed Jun 15 19:59:40 2016// +/log.c/1.17/Wed Jun 15 19:59:40 2016// +/log.h/1.5/Wed Jun 15 19:59:40 2016// +/mailaddr.c/1.2/Wed Jun 15 19:59:40 2016// +/makemap.8/1.29/Sun May 8 15:40:28 2016// +/makemap.c/1.65/Wed Jun 15 19:59:40 2016// +/mda.c/1.119/Wed Jun 15 19:59:40 2016// +/mproc.c/1.20/Wed Jun 15 19:59:43 2016// +/mta.c/1.201/Wed Jun 15 19:59:40 2016// +/mta_session.c/1.83/Wed Jun 15 19:59:40 2016// +/newaliases.8/1.11/Sun May 8 15:40:28 2016// +/parse.y/1.184/Wed Jun 15 19:59:40 2016// +/parser.c/1.40/Wed Jun 15 19:59:40 2016// +/parser.h/1.29/Sun May 8 15:40:28 2016// +/pony.c/1.13/Wed Jun 15 19:59:43 2016// +/queue.c/1.178/Wed Jun 15 19:59:43 2016// +/queue_backend.c/1.62/Wed Jun 15 19:59:40 2016// +/queue_fs.c/1.14/Wed Jun 15 19:59:40 2016// +/queue_null.c/1.6/Wed Jun 15 19:59:40 2016// +/queue_proc.c/1.6/Wed Jun 15 19:59:40 2016// +/queue_ram.c/1.7/Wed Jun 15 19:59:40 2016// +/rfc2822.c/1.7/Wed Jun 15 19:59:40 2016// +/rfc2822.h/1.4/Sun May 8 15:40:28 2016// +/ruleset.c/1.32/Wed Jun 15 19:59:40 2016// +/runq.c/1.2/Wed Jun 15 19:59:40 2016// +/scheduler.c/1.52/Wed Jun 15 19:59:43 2016// +/scheduler_backend.c/1.15/Wed Jun 15 19:59:40 2016// +/scheduler_null.c/1.9/Wed Jun 15 19:59:40 2016// +/scheduler_proc.c/1.8/Wed Jun 15 19:59:40 2016// +/scheduler_ramqueue.c/1.42/Wed Jun 15 19:59:40 2016// +/sendmail.8/1.4/Sun May 8 15:40:28 2016// +/smtp.c/1.155/Wed Jun 15 19:59:40 2016// +/smtp_session.c/1.274/Wed Jun 15 20:00:30 2016// +/smtpctl.8/1.57/Wed Jun 15 20:00:30 2016// +/smtpctl.c/1.149/Wed Jun 15 19:59:40 2016// +/smtpd-api.h/1.29/Sun May 8 15:40:28 2016// +/smtpd-defines.h/1.6/Wed Jun 15 19:59:40 2016// +/smtpd.8/1.30/Sun May 8 16:37:15 2016// +/smtpd.c/1.278/Wed Jun 15 19:59:43 2016// +/smtpd.conf.5/1.161/Wed Jun 15 19:59:40 2016// +/smtpd.h/1.515/Wed Jun 15 19:59:43 2016// +/ssl.c/1.86/Wed Jun 15 19:59:40 2016// +/ssl.h/1.20/Wed Jun 15 19:59:40 2016// +/ssl_smtpd.c/1.13/Wed Jun 15 19:59:40 2016// +/stat_backend.c/1.10/Wed Jun 15 19:59:40 2016// +/stat_ramstat.c/1.10/Wed Jun 15 19:59:40 2016// +/table.5/1.5/Sun May 8 15:40:28 2016// +/table.c/1.23/Wed Jun 15 19:59:40 2016// +/table_api.c/1.8/Wed Jun 15 19:59:40 2016// +/table_db.c/1.9/Wed Jun 15 19:59:40 2016// +/table_getpwnam.c/1.4/Wed Jun 15 19:59:40 2016// +/table_proc.c/1.6/Wed Jun 15 19:59:40 2016// +/table_static.c/1.15/Wed Jun 15 19:59:40 2016// +/to.c/1.28/Wed Jun 15 19:59:43 2016// +/tree.c/1.5/Wed Jun 15 19:59:40 2016// +/util.c/1.127/Wed Jun 15 19:59:40 2016// +/waitq.c/1.5/Wed Jun 15 19:59:40 2016// diff --git a/smtpd/limit.c b/smtpd/limit.c index 7b003a0d..25e7a026 100644 --- a/smtpd/limit.c +++ b/smtpd/limit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: limit.c,v 1.4 2015/01/20 17:37:54 deraadt Exp $ */ +/* $OpenBSD: limit.c,v 1.5 2016/06/15 19:59:03 gilles Exp $ */ /* * Copyright (c) 2013 Eric Faurot <eric@openbsd.org> @@ -41,7 +41,7 @@ limit_mta_set_defaults(struct mta_limits *limits) { limits->maxconn_per_host = 10; limits->maxconn_per_route = 5; - limits->maxconn_per_source = 50; + limits->maxconn_per_source = 100; limits->maxconn_per_connector = 20; limits->maxconn_per_relay = 100; limits->maxconn_per_domain = 100; @@ -56,7 +56,7 @@ limit_mta_set_defaults(struct mta_limits *limits) limits->discdelay_route = 3; limits->max_mail_per_session = 100; - limits->sessdelay_transaction = 1; + limits->sessdelay_transaction = 0; limits->sessdelay_keepalive = 10; limits->max_failures_per_session = 25; diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c index ceec9445..df9652a8 100644 --- a/smtpd/smtp_session.c +++ b/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.272 2016/05/22 16:31:21 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.274 2016/06/15 19:56:07 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1206,7 +1206,7 @@ smtp_filter_fd(uint64_t id, int fd) if (s->flags & SF_SECURE) { x = SSL_get_peer_certificate(s->io.ssl); iobuf_fqueue(&s->obuf, - "\n\tTLS version=%s cipher=%s bits=%d verify=%s", + " (%s:%s:%d:%s)", SSL_get_version(s->io.ssl), SSL_get_cipher_name(s->io.ssl), SSL_get_cipher_bits(s->io.ssl, NULL), @@ -1260,7 +1260,7 @@ smtp_io(struct io *io, int evt) switch (evt) { case IO_TLSREADY: - log_info("%016"PRIx64" smtp event=starttls ciphers=%s", + log_info("%016"PRIx64" smtp event=starttls ciphers=\"%s\"", s->id, ssl_to_text(s->io.ssl)); s->flags |= SF_SECURE; @@ -1285,7 +1285,7 @@ smtp_io(struct io *io, int evt) x = SSL_get_peer_certificate(s->io.ssl); if (x) { log_info("%016"PRIx64" smtp " - "event=client-cert-check result=%s", + "event=client-cert-check result=\"%s\"", s->id, (s->flags & SF_VERIFIED) ? "success" : "failure"); X509_free(x); @@ -1404,7 +1404,7 @@ smtp_io(struct io *io, int evt) break; case IO_ERROR: - log_info("%016"PRIx64" smtp event=closed reason=io-error: %s", + log_info("%016"PRIx64" smtp event=closed reason=\"io-error: %s\"", s->id, io->error); smtp_free(s, "IO error"); break; @@ -2185,7 +2185,7 @@ smtp_reply(struct smtp_session *s, char *fmt, ...) case '4': if (s->flags & SF_BADINPUT) { log_info("%016"PRIx64" smtp " - "event=bad-input result=%.*s", + "event=bad-input result=\"%.*s\"", s->id, n, buf); } else if (s->state == STATE_AUTH_INIT) { @@ -2203,7 +2203,7 @@ smtp_reply(struct smtp_session *s, char *fmt, ...) else { strnvis(tmp, s->cmd, sizeof tmp, VIS_SAFE | VIS_CSTYLE); log_info("%016"PRIx64" smtp " - "event=failed-command command=%s result=%.*s", + "event=failed-command command=\"%s\" result=\"%.*s\"", s->id, tmp, n, buf); } break; diff --git a/smtpd/smtpctl.8 b/smtpd/smtpctl.8 index 0b5b07b8..42a599ae 100644 --- a/smtpd/smtpctl.8 +++ b/smtpd/smtpctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpctl.8,v 1.56 2016/06/02 18:19:54 jung Exp $ +.\" $OpenBSD: smtpctl.8,v 1.57 2016/06/14 22:40:48 millert Exp $ .\" .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> .\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 2 2016 $ +.Dd $Mdocdate: June 14 2016 $ .Dt SMTPCTL 8 .Os .Sh NAME @@ -237,7 +237,7 @@ The route is currently disabled. The route is new. No SMTP session has been established yet. .It Q -The route as a timeout registered to lower its penalty level and possibly +The route has a timeout registered to lower its penalty level and possibly reactivate or discard it. .El .It Cm show stats |