diff options
author | Gilles Chehade <gilles@dalenys.com> | 2016-05-21 21:30:24 +0200 |
---|---|---|
committer | Gilles Chehade <gilles@dalenys.com> | 2016-05-21 21:30:24 +0200 |
commit | e27cced1ee3933ab3a20e05932d2995f65dac61d (patch) | |
tree | 68adfe9f5dd9aa58dd56df142d6989a093790e14 | |
parent | require higher autoconf/automake versions and fix version check (diff) | |
parent | sync with OpenBSD: (diff) | |
download | OpenSMTPD-e27cced1ee3933ab3a20e05932d2995f65dac61d.tar.xz OpenSMTPD-e27cced1ee3933ab3a20e05932d2995f65dac61d.zip |
Merge branch 'master' into portable
-rw-r--r-- | smtpd/CVS/Entries | 148 | ||||
-rw-r--r-- | smtpd/aliases.c | 8 | ||||
-rw-r--r-- | smtpd/ioev.c | 4 | ||||
-rw-r--r-- | smtpd/smtpd.conf.5 | 8 |
4 files changed, 84 insertions, 84 deletions
diff --git a/smtpd/CVS/Entries b/smtpd/CVS/Entries index 7c1b8c8b..a1f76e2b 100644 --- a/smtpd/CVS/Entries +++ b/smtpd/CVS/Entries @@ -2,89 +2,89 @@ D/smtpctl//// D/smtpd//// /Makefile/1.15/Sun May 8 15:40:28 2016// /aliases.5/1.12/Sun May 8 15:40:28 2016// -/aliases.c/1.69/Mon May 16 20:12:13 2016// -/bounce.c/1.72/Mon May 16 20:12:13 2016// -/ca.c/1.21/Mon May 16 20:12:13 2016// -/compress_backend.c/1.9/Mon May 16 20:12:13 2016// -/compress_gzip.c/1.10/Mon May 16 20:12:13 2016// -/config.c/1.34/Mon May 16 20:12:13 2016// -/control.c/1.112/Mon May 16 20:12:13 2016// -/crypto.c/1.5/Mon May 16 20:12:13 2016// -/delivery.c/1.6/Mon May 16 20:12:13 2016// -/delivery_filename.c/1.14/Mon May 16 20:12:13 2016// -/delivery_lmtp.c/1.15/Mon May 16 20:12:13 2016// -/delivery_maildir.c/1.17/Mon May 16 20:12:13 2016// -/delivery_mbox.c/1.12/Mon May 16 20:12:13 2016// -/delivery_mda.c/1.9/Mon May 16 20:12:13 2016// -/dict.c/1.5/Mon May 16 20:12:13 2016// -/dns.c/1.83/Mon May 16 20:12:13 2016// -/enqueue.c/1.112/Mon May 16 20:12:13 2016// -/envelope.c/1.36/Mon May 16 20:12:13 2016// -/esc.c/1.4/Mon May 16 20:12:13 2016// -/expand.c/1.29/Mon May 16 20:12:13 2016// -/filter.c/1.18/Result of merge// /forward.5/1.9/Sun May 8 15:40:28 2016// -/forward.c/1.39/Mon May 16 20:12:13 2016// -/iobuf.c/1.9/Mon May 16 20:12:13 2016// /iobuf.h/1.4/Sun May 8 15:40:28 2016// -/ioev.c/1.25/Mon May 16 20:12:13 2016// /ioev.h/1.6/Sun May 8 16:37:15 2016// -/limit.c/1.4/Mon May 16 20:12:13 2016// -/lka.c/1.192/Mon May 16 20:12:13 2016// -/lka_session.c/1.79/Mon May 16 20:12:13 2016// -/log.c/1.17/Mon May 16 20:12:13 2016// -/log.h/1.5/Mon May 16 20:12:13 2016// -/mailaddr.c/1.2/Mon May 16 20:12:13 2016// /makemap.8/1.29/Sun May 8 15:40:28 2016// -/makemap.c/1.65/Mon May 16 20:12:13 2016// -/mda.c/1.118/Mon May 16 20:12:13 2016// -/mproc.c/1.19/Mon May 16 20:12:13 2016// -/mta.c/1.200/Mon May 16 20:12:13 2016// -/mta_session.c/1.82/Mon May 16 20:12:13 2016// /newaliases.8/1.11/Sun May 8 15:40:28 2016// -/parse.y/1.184/Mon May 16 20:12:13 2016// -/parser.c/1.40/Mon May 16 20:12:13 2016// /parser.h/1.29/Sun May 8 15:40:28 2016// -/pony.c/1.12/Mon May 16 20:12:13 2016// -/queue.c/1.177/Mon May 16 20:12:13 2016// -/queue_backend.c/1.62/Mon May 16 20:12:13 2016// -/queue_fs.c/1.14/Mon May 16 20:12:13 2016// -/queue_null.c/1.6/Mon May 16 20:12:13 2016// -/queue_proc.c/1.6/Mon May 16 20:12:13 2016// -/queue_ram.c/1.7/Mon May 16 20:12:13 2016// -/rfc2822.c/1.7/Mon May 16 20:12:13 2016// /rfc2822.h/1.4/Sun May 8 15:40:28 2016// -/ruleset.c/1.32/Mon May 16 20:12:13 2016// -/runq.c/1.2/Mon May 16 20:12:13 2016// -/scheduler.c/1.51/Mon May 16 20:12:13 2016// -/scheduler_backend.c/1.15/Mon May 16 20:12:13 2016// -/scheduler_null.c/1.9/Mon May 16 20:12:13 2016// -/scheduler_proc.c/1.8/Mon May 16 20:12:13 2016// -/scheduler_ramqueue.c/1.42/Mon May 16 20:12:13 2016// /sendmail.8/1.4/Sun May 8 15:40:28 2016// -/smtp.c/1.155/Mon May 16 20:12:13 2016// -/smtp_session.c/1.271/Result of merge// /smtpctl.8/1.55/Sun May 8 16:37:15 2016// -/smtpctl.c/1.149/Mon May 16 20:12:13 2016// /smtpd-api.h/1.29/Sun May 8 15:40:28 2016// -/smtpd-defines.h/1.6/Mon May 16 20:12:13 2016// /smtpd.8/1.30/Sun May 8 16:37:15 2016// -/smtpd.c/1.276/Mon May 16 20:12:13 2016// -/smtpd.conf.5/1.160/Mon May 16 20:16:20 2016// -/smtpd.h/1.514/Mon May 16 20:12:13 2016// -/ssl.c/1.86/Mon May 16 20:12:13 2016// -/ssl.h/1.20/Mon May 16 20:12:13 2016// -/ssl_smtpd.c/1.13/Mon May 16 20:12:13 2016// -/stat_backend.c/1.10/Mon May 16 20:12:13 2016// -/stat_ramstat.c/1.10/Mon May 16 20:12:13 2016// /table.5/1.5/Sun May 8 15:40:28 2016// -/table.c/1.23/Mon May 16 20:12:13 2016// -/table_api.c/1.8/Mon May 16 20:12:13 2016// -/table_db.c/1.9/Mon May 16 20:12:13 2016// -/table_getpwnam.c/1.4/Mon May 16 20:12:13 2016// -/table_proc.c/1.6/Mon May 16 20:12:13 2016// -/table_static.c/1.15/Mon May 16 20:12:13 2016// -/to.c/1.26/Mon May 16 20:12:13 2016// -/tree.c/1.5/Mon May 16 20:12:13 2016// -/util.c/1.127/Mon May 16 20:16:20 2016// -/waitq.c/1.5/Mon May 16 20:12:13 2016// +/aliases.c/1.70/Sat May 21 19:29:14 2016// +/bounce.c/1.72/Sat May 21 17:46:36 2016// +/ca.c/1.21/Sat May 21 17:46:36 2016// +/compress_backend.c/1.9/Sat May 21 17:46:36 2016// +/compress_gzip.c/1.10/Sat May 21 17:46:36 2016// +/config.c/1.34/Sat May 21 17:46:36 2016// +/control.c/1.112/Sat May 21 17:46:36 2016// +/crypto.c/1.5/Sat May 21 17:46:36 2016// +/delivery.c/1.6/Sat May 21 17:46:36 2016// +/delivery_filename.c/1.14/Sat May 21 17:46:36 2016// +/delivery_lmtp.c/1.15/Sat May 21 17:46:36 2016// +/delivery_maildir.c/1.17/Sat May 21 17:46:36 2016// +/delivery_mbox.c/1.12/Sat May 21 17:46:36 2016// +/delivery_mda.c/1.9/Sat May 21 17:46:36 2016// +/dict.c/1.5/Sat May 21 17:46:36 2016// +/dns.c/1.83/Sat May 21 17:46:36 2016// +/enqueue.c/1.112/Sat May 21 17:46:36 2016// +/envelope.c/1.36/Sat May 21 17:46:36 2016// +/esc.c/1.4/Sat May 21 17:46:36 2016// +/expand.c/1.29/Sat May 21 17:46:36 2016// +/filter.c/1.18/Sat May 21 17:46:36 2016// +/forward.c/1.39/Sat May 21 17:46:36 2016// +/iobuf.c/1.9/Sat May 21 17:46:36 2016// +/ioev.c/1.26/Sat May 21 19:29:14 2016// +/limit.c/1.4/Sat May 21 17:46:36 2016// +/lka.c/1.192/Sat May 21 17:46:36 2016// +/lka_session.c/1.79/Sat May 21 17:46:36 2016// +/log.c/1.17/Sat May 21 17:46:36 2016// +/log.h/1.5/Sat May 21 17:46:36 2016// +/mailaddr.c/1.2/Sat May 21 17:46:36 2016// +/makemap.c/1.65/Sat May 21 17:46:36 2016// +/mda.c/1.118/Sat May 21 17:46:36 2016// +/mproc.c/1.19/Sat May 21 17:46:36 2016// +/mta.c/1.200/Sat May 21 17:46:36 2016// +/mta_session.c/1.82/Sat May 21 17:46:36 2016// +/parse.y/1.184/Sat May 21 17:46:36 2016// +/parser.c/1.40/Sat May 21 17:46:36 2016// +/pony.c/1.12/Sat May 21 17:46:36 2016// +/queue.c/1.177/Sat May 21 17:46:36 2016// +/queue_backend.c/1.62/Sat May 21 17:46:36 2016// +/queue_fs.c/1.14/Sat May 21 17:46:36 2016// +/queue_null.c/1.6/Sat May 21 17:46:36 2016// +/queue_proc.c/1.6/Sat May 21 17:46:36 2016// +/queue_ram.c/1.7/Sat May 21 17:46:36 2016// +/rfc2822.c/1.7/Sat May 21 17:46:36 2016// +/ruleset.c/1.32/Sat May 21 17:46:36 2016// +/runq.c/1.2/Sat May 21 17:46:36 2016// +/scheduler.c/1.51/Sat May 21 17:46:36 2016// +/scheduler_backend.c/1.15/Sat May 21 17:46:36 2016// +/scheduler_null.c/1.9/Sat May 21 17:46:36 2016// +/scheduler_proc.c/1.8/Sat May 21 17:46:36 2016// +/scheduler_ramqueue.c/1.42/Sat May 21 17:46:36 2016// +/smtp.c/1.155/Sat May 21 17:46:36 2016// +/smtp_session.c/1.271/Sat May 21 17:46:36 2016// +/smtpctl.c/1.149/Sat May 21 18:44:07 2016// +/smtpd-defines.h/1.6/Sat May 21 17:46:36 2016// +/smtpd.c/1.276/Sat May 21 17:46:36 2016// +/smtpd.conf.5/1.161/Sat May 21 19:29:15 2016// +/smtpd.h/1.514/Sat May 21 17:46:36 2016// +/ssl.c/1.86/Sat May 21 17:46:36 2016// +/ssl.h/1.20/Sat May 21 17:46:36 2016// +/ssl_smtpd.c/1.13/Sat May 21 17:46:36 2016// +/stat_backend.c/1.10/Sat May 21 17:46:36 2016// +/stat_ramstat.c/1.10/Sat May 21 17:46:36 2016// +/table.c/1.23/Sat May 21 17:46:36 2016// +/table_api.c/1.8/Sat May 21 17:46:36 2016// +/table_db.c/1.9/Sat May 21 17:46:36 2016// +/table_getpwnam.c/1.4/Sat May 21 17:46:36 2016// +/table_proc.c/1.6/Sat May 21 17:46:36 2016// +/table_static.c/1.15/Sat May 21 17:46:36 2016// +/to.c/1.26/Sat May 21 17:46:36 2016// +/tree.c/1.5/Sat May 21 17:46:36 2016// +/util.c/1.127/Sat May 21 17:46:36 2016// +/waitq.c/1.5/Sat May 21 17:46:36 2016// diff --git a/smtpd/aliases.c b/smtpd/aliases.c index 6b5b2b7a..4c935b31 100644 --- a/smtpd/aliases.c +++ b/smtpd/aliases.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aliases.c,v 1.69 2015/12/28 22:08:30 jung Exp $ */ +/* $OpenBSD: aliases.c,v 1.70 2016/05/21 19:28:19 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -133,8 +133,8 @@ aliases_virtual_get(struct expand *expand, const struct mailaddr *maddr) /* first, check if entry has a user-part tag */ if (tag[0]) { - if (!bsnprintf(buf, sizeof(buf), "%s+%s@%s", - user, tag, domain)) + if (!bsnprintf(buf, sizeof(buf), "%s%c%s@%s", + user, TAG_CHAR, tag, domain)) return 0; ret = table_lookup(mapping, NULL, buf, K_ALIAS, &lk); if (ret < 0) @@ -154,7 +154,7 @@ aliases_virtual_get(struct expand *expand, const struct mailaddr *maddr) if (tag[0]) { /* Failed ? We lookup for username + user-part tag */ - if (!bsnprintf(buf, sizeof(buf), "%s+%s", user, tag)) + if (!bsnprintf(buf, sizeof(buf), "%s%c%s", user, TAG_CHAR, tag)) return 0; ret = table_lookup(mapping, NULL, buf, K_ALIAS, &lk); if (ret < 0) diff --git a/smtpd/ioev.c b/smtpd/ioev.c index ee0fabb8..2622b799 100644 --- a/smtpd/ioev.c +++ b/smtpd/ioev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioev.c,v 1.25 2016/03/25 15:06:58 krw Exp $ */ +/* $OpenBSD: ioev.c,v 1.26 2016/05/16 21:43:16 millert Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -142,7 +142,7 @@ io_set_nonblocking(int fd) flags |= O_NONBLOCK; - if ((flags = fcntl(fd, F_SETFL, flags)) == -1) + if (fcntl(fd, F_SETFL, flags) == -1) err(1, "io_set_blocking:fcntl(F_SETFL)"); } diff --git a/smtpd/smtpd.conf.5 b/smtpd/smtpd.conf.5 index d9110b59..8b109184 100644 --- a/smtpd/smtpd.conf.5 +++ b/smtpd/smtpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpd.conf.5,v 1.160 2016/05/11 18:34:44 jung Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.161 2016/05/19 08:21:23 gilles Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -17,7 +17,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: May 11 2016 $ +.Dd $Mdocdate: May 19 2016 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -202,7 +202,7 @@ holds a key-value mapping of virtual to system users. For an example of how to configure the .Ar users table, see -.Xr makemap 8 . +.Xr table 5 . .It Xo .Ic for .Op Ic \&! @@ -219,7 +219,7 @@ holds a key-value mapping of virtual to system users. For an example of how to configure the .Ar users table, see -.Xr makemap 8 . +.Xr table 5 . .It Xo .Ic for .Op Ic \&! |