diff options
| -rw-r--r-- | smtpd/CVS/Entries | 148 | ||||
| -rw-r--r-- | smtpd/smtpd.c | 12 |
2 files changed, 83 insertions, 77 deletions
diff --git a/smtpd/CVS/Entries b/smtpd/CVS/Entries index 0ff82bae..0b1bb7ad 100644 --- a/smtpd/CVS/Entries +++ b/smtpd/CVS/Entries @@ -14,77 +14,77 @@ D/smtpd//// /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/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// +/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// diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c index a441e766..15788cd2 100644 --- a/smtpd/smtpd.c +++ b/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.277 2016/05/28 21:21:20 eric Exp $ */ +/* $OpenBSD: smtpd.c,v 1.278 2016/06/07 06:52:49 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -843,9 +843,12 @@ start_child(int save_argc, char **save_argv, char *rexec) if (save_argc >= SMTPD_MAXARG - 2) fatalx("too many arguments"); - if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, PF_UNSPEC, sp) == -1) + if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) fatal("socketpair"); + io_set_nonblocking(sp[0]); + io_set_nonblocking(sp[1]); + switch (pid = fork()) { case -1: fatal("%s: fork", save_argv[0]); @@ -884,9 +887,12 @@ setup_peers(struct mproc *a, struct mproc *b) { int sp[2]; - if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, PF_UNSPEC, sp) == -1) + if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) fatal("socketpair"); + io_set_nonblocking(sp[0]); + io_set_nonblocking(sp[1]); + if (imsg_compose(&a->imsgbuf, IMSG_SETUP_PEER, b->proc, b->pid, sp[0], NULL, 0) == -1) fatal("imsg_compose"); |