diff options
| author |   gilles <gilles@openbsd.org> | 2016-06-07 06:52:49 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2016-06-07 06:52:49 +0000 |
| commit | 9877f9626cd3a002f1f5aba9ee3af59f831f69d6 (patch) | |
| tree | c4ba781e001b8b6fb924e0db83288263c1671786 | |
| parent | remove splsoftfd and splausoft (diff) | |
| download | wireguard-openbsd-9877f9626cd3a002f1f5aba9ee3af59f831f69d6.tar.xz wireguard-openbsd-9877f9626cd3a002f1f5aba9ee3af59f831f69d6.zip | |
use io_set_nonblocking() instead of SOCK_NONBLOCKING to reduce delta with
-portable
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index db665550692..a3d3eeea656 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/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> @@ -789,9 +789,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]); @@ -830,9 +833,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"); |