aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smtpd/CVS/Entries148
-rw-r--r--smtpd/mproc.c4
2 files changed, 76 insertions, 76 deletions
diff --git a/smtpd/CVS/Entries b/smtpd/CVS/Entries
index 94345210..0ff82bae 100644
--- a/smtpd/CVS/Entries
+++ b/smtpd/CVS/Entries
@@ -13,78 +13,78 @@ D/smtpd////
/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//
-/aliases.c/1.70/Sun Jun 5 12:10:36 2016//
-/bounce.c/1.72/Sun Jun 5 12:10:36 2016//
-/ca.c/1.22/Sun Jun 5 12:10:36 2016//
-/compress_backend.c/1.9/Sun Jun 5 12:10:36 2016//
-/compress_gzip.c/1.10/Sun Jun 5 12:10:36 2016//
-/config.c/1.35/Sun Jun 5 12:10:36 2016//
-/control.c/1.113/Sun Jun 5 12:10:36 2016//
-/crypto.c/1.5/Sun Jun 5 12:10:36 2016//
-/delivery.c/1.6/Sun Jun 5 12:10:36 2016//
-/delivery_filename.c/1.14/Sun Jun 5 12:10:36 2016//
-/delivery_lmtp.c/1.17/Sun Jun 5 12:10:47 2016//
-/delivery_maildir.c/1.17/Sun Jun 5 12:10:36 2016//
-/delivery_mbox.c/1.12/Sun Jun 5 12:10:36 2016//
-/delivery_mda.c/1.9/Sun Jun 5 12:10:36 2016//
-/dict.c/1.5/Sun Jun 5 12:10:36 2016//
-/dns.c/1.83/Sun Jun 5 12:10:36 2016//
-/enqueue.c/1.112/Sun Jun 5 12:10:36 2016//
-/envelope.c/1.36/Sun Jun 5 12:10:36 2016//
-/esc.c/1.4/Sun Jun 5 12:10:36 2016//
-/expand.c/1.29/Sun Jun 5 12:10:36 2016//
-/filter.c/1.18/Sun Jun 5 12:10:36 2016//
-/forward.c/1.39/Sun Jun 5 12:10:36 2016//
-/iobuf.c/1.9/Sun Jun 5 12:10:36 2016//
-/ioev.c/1.26/Sun Jun 5 12:10:36 2016//
-/limit.c/1.4/Sun Jun 5 12:10:36 2016//
-/lka.c/1.193/Sun Jun 5 12:10:36 2016//
-/lka_session.c/1.79/Sun Jun 5 12:10:36 2016//
-/log.c/1.17/Sun Jun 5 12:10:36 2016//
-/log.h/1.5/Sun Jun 5 12:10:36 2016//
-/mailaddr.c/1.2/Sun Jun 5 12:10:36 2016//
-/makemap.c/1.65/Sun Jun 5 12:10:36 2016//
-/mda.c/1.119/Sun Jun 5 12:10:36 2016//
-/mproc.c/1.19/Sun Jun 5 12:10:36 2016//
-/mta.c/1.201/Sun Jun 5 12:10:36 2016//
-/mta_session.c/1.83/Sun Jun 5 12:10:36 2016//
-/parse.y/1.184/Sun Jun 5 12:10:36 2016//
-/parser.c/1.40/Sun Jun 5 12:10:36 2016//
-/pony.c/1.13/Sun Jun 5 12:10:36 2016//
-/queue.c/1.178/Sun Jun 5 12:10:36 2016//
-/queue_backend.c/1.62/Sun Jun 5 12:10:36 2016//
-/queue_fs.c/1.14/Sun Jun 5 12:10:36 2016//
-/queue_null.c/1.6/Sun Jun 5 12:10:36 2016//
-/queue_proc.c/1.6/Sun Jun 5 12:10:36 2016//
-/queue_ram.c/1.7/Sun Jun 5 12:10:36 2016//
-/rfc2822.c/1.7/Sun Jun 5 12:10:36 2016//
-/ruleset.c/1.32/Sun Jun 5 12:10:36 2016//
-/runq.c/1.2/Sun Jun 5 12:10:36 2016//
-/scheduler.c/1.52/Sun Jun 5 12:10:36 2016//
-/scheduler_backend.c/1.15/Sun Jun 5 12:10:36 2016//
-/scheduler_null.c/1.9/Sun Jun 5 12:10:36 2016//
-/scheduler_proc.c/1.8/Sun Jun 5 12:10:36 2016//
-/scheduler_ramqueue.c/1.42/Sun Jun 5 12:10:36 2016//
-/smtp.c/1.155/Sun Jun 5 12:10:36 2016//
-/smtp_session.c/1.272/Sun Jun 5 12:10:36 2016//
/smtpctl.8/1.56/Sun Jun 5 12:06:51 2016//
-/smtpctl.c/1.149/Sun Jun 5 12:10:36 2016//
-/smtpd-defines.h/1.6/Sun Jun 5 12:10:36 2016//
-/smtpd.c/1.277/Sun Jun 5 12:10:36 2016//
-/smtpd.conf.5/1.161/Sun Jun 5 12:10:36 2016//
-/smtpd.h/1.515/Sun Jun 5 12:10:36 2016//
-/ssl.c/1.86/Sun Jun 5 12:10:36 2016//
-/ssl.h/1.20/Sun Jun 5 12:10:36 2016//
-/ssl_smtpd.c/1.13/Sun Jun 5 12:10:36 2016//
-/stat_backend.c/1.10/Sun Jun 5 12:10:36 2016//
-/stat_ramstat.c/1.10/Sun Jun 5 12:10:36 2016//
-/table.c/1.23/Sun Jun 5 12:10:36 2016//
-/table_api.c/1.8/Sun Jun 5 12:10:36 2016//
-/table_db.c/1.9/Sun Jun 5 12:10:36 2016//
-/table_getpwnam.c/1.4/Sun Jun 5 12:10:36 2016//
-/table_proc.c/1.6/Sun Jun 5 12:10:36 2016//
-/table_static.c/1.15/Sun Jun 5 12:10:36 2016//
-/to.c/1.28/Sun Jun 5 12:10:36 2016//
-/tree.c/1.5/Sun Jun 5 12:10:36 2016//
-/util.c/1.127/Sun Jun 5 12:10:36 2016//
-/waitq.c/1.5/Sun Jun 5 12:10:36 2016//
+/aliases.c/1.70/Mon Jun 6 20:47:29 2016//
+/bounce.c/1.72/Mon Jun 6 20:47:29 2016//
+/ca.c/1.22/Mon Jun 6 20:47:29 2016//
+/compress_backend.c/1.9/Mon Jun 6 20:47:29 2016//
+/compress_gzip.c/1.10/Mon Jun 6 20:47:29 2016//
+/config.c/1.35/Mon Jun 6 20:47:29 2016//
+/control.c/1.113/Mon Jun 6 20:47:29 2016//
+/crypto.c/1.5/Mon Jun 6 20:47:29 2016//
+/delivery.c/1.6/Mon Jun 6 20:47:29 2016//
+/delivery_filename.c/1.14/Mon Jun 6 20:47:29 2016//
+/delivery_lmtp.c/1.17/Mon Jun 6 20:47:29 2016//
+/delivery_maildir.c/1.17/Mon Jun 6 20:47:29 2016//
+/delivery_mbox.c/1.12/Mon Jun 6 20:47:29 2016//
+/delivery_mda.c/1.9/Mon Jun 6 20:47:29 2016//
+/dict.c/1.5/Mon Jun 6 20:47:29 2016//
+/dns.c/1.83/Mon Jun 6 20:47:29 2016//
+/enqueue.c/1.112/Mon Jun 6 20:47:29 2016//
+/envelope.c/1.36/Mon Jun 6 20:47:29 2016//
+/esc.c/1.4/Mon Jun 6 20:47:29 2016//
+/expand.c/1.29/Mon Jun 6 20:47:29 2016//
+/filter.c/1.18/Mon Jun 6 20:47:29 2016//
+/forward.c/1.39/Mon Jun 6 20:47:29 2016//
+/iobuf.c/1.9/Mon Jun 6 20:47:29 2016//
+/ioev.c/1.26/Mon Jun 6 20:47:29 2016//
+/limit.c/1.4/Mon Jun 6 20:47:29 2016//
+/lka.c/1.193/Mon Jun 6 20:47:29 2016//
+/lka_session.c/1.79/Mon Jun 6 20:47:29 2016//
+/log.c/1.17/Mon Jun 6 20:47:29 2016//
+/log.h/1.5/Mon Jun 6 20:47:29 2016//
+/mailaddr.c/1.2/Mon Jun 6 20:47:29 2016//
+/makemap.c/1.65/Mon Jun 6 20:47:29 2016//
+/mda.c/1.119/Mon Jun 6 20:47:29 2016//
+/mta.c/1.201/Mon Jun 6 20:47:29 2016//
+/mta_session.c/1.83/Mon Jun 6 20:47:29 2016//
+/parse.y/1.184/Mon Jun 6 20:47:29 2016//
+/parser.c/1.40/Mon Jun 6 20:47:29 2016//
+/pony.c/1.13/Mon Jun 6 20:47:29 2016//
+/queue.c/1.178/Mon Jun 6 20:47:29 2016//
+/queue_backend.c/1.62/Mon Jun 6 20:47:29 2016//
+/queue_fs.c/1.14/Mon Jun 6 20:47:29 2016//
+/queue_null.c/1.6/Mon Jun 6 20:47:29 2016//
+/queue_proc.c/1.6/Mon Jun 6 20:47:29 2016//
+/queue_ram.c/1.7/Mon Jun 6 20:47:29 2016//
+/rfc2822.c/1.7/Mon Jun 6 20:47:29 2016//
+/ruleset.c/1.32/Mon Jun 6 20:47:29 2016//
+/runq.c/1.2/Mon Jun 6 20:47:29 2016//
+/scheduler.c/1.52/Mon Jun 6 20:47:29 2016//
+/scheduler_backend.c/1.15/Mon Jun 6 20:47:29 2016//
+/scheduler_null.c/1.9/Mon Jun 6 20:47:29 2016//
+/scheduler_proc.c/1.8/Mon Jun 6 20:47:29 2016//
+/scheduler_ramqueue.c/1.42/Mon Jun 6 20:47:29 2016//
+/smtp.c/1.155/Mon Jun 6 20:47:29 2016//
+/smtp_session.c/1.272/Mon Jun 6 20:47:29 2016//
+/smtpctl.c/1.149/Mon Jun 6 20:47:29 2016//
+/smtpd-defines.h/1.6/Mon Jun 6 20:47:29 2016//
+/smtpd.c/1.277/Mon Jun 6 20:47:29 2016//
+/smtpd.conf.5/1.161/Mon Jun 6 20:47:29 2016//
+/smtpd.h/1.515/Mon Jun 6 20:47:29 2016//
+/ssl.c/1.86/Mon Jun 6 20:47:29 2016//
+/ssl.h/1.20/Mon Jun 6 20:47:29 2016//
+/ssl_smtpd.c/1.13/Mon Jun 6 20:47:29 2016//
+/stat_backend.c/1.10/Mon Jun 6 20:47:29 2016//
+/stat_ramstat.c/1.10/Mon Jun 6 20:47:29 2016//
+/table.c/1.23/Mon Jun 6 20:47:29 2016//
+/table_api.c/1.8/Mon Jun 6 20:47:29 2016//
+/table_db.c/1.9/Mon Jun 6 20:47:29 2016//
+/table_getpwnam.c/1.4/Mon Jun 6 20:47:29 2016//
+/table_proc.c/1.6/Mon Jun 6 20:47:29 2016//
+/table_static.c/1.15/Mon Jun 6 20:47:29 2016//
+/to.c/1.28/Mon Jun 6 20:47:29 2016//
+/tree.c/1.5/Mon Jun 6 20:47:29 2016//
+/util.c/1.127/Mon Jun 6 20:47:29 2016//
+/waitq.c/1.5/Mon Jun 6 20:47:29 2016//
+/mproc.c/1.20/Mon Jun 6 20:48:24 2016//
diff --git a/smtpd/mproc.c b/smtpd/mproc.c
index 71bcbc08..15b04624 100644
--- a/smtpd/mproc.c
+++ b/smtpd/mproc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mproc.c,v 1.19 2016/03/25 15:06:58 krw Exp $ */
+/* $OpenBSD: mproc.c,v 1.20 2016/06/06 20:48:15 eric Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@faurot.net>
@@ -161,7 +161,7 @@ mproc_dispatch(int fd, short event, void *arg)
switch (n) {
case -1:
if (errno == EAGAIN)
- return;
+ break;
log_warn("warn: %s -> %s: imsg_read",
proc_name(smtpd_process), p->name);
fatal("exiting");