summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2017-05-27 10:57:23 +0000
committerflorian <florian@openbsd.org>2017-05-27 10:57:23 +0000
commit77fd4fe4f43aa9c17f53d3cd49003bbe7b68577c (patch)
tree09dc0ce6079533bcc63d2adffdaf6e614304d65c
parenthandle expiration / renewal of non-privacy addresses (diff)
downloadwireguard-openbsd-77fd4fe4f43aa9c17f53d3cd49003bbe7b68577c.tar.xz
wireguard-openbsd-77fd4fe4f43aa9c17f53d3cd49003bbe7b68577c.zip
SOCK_CLOEXEC | SOCK_NONBLOCK
-rw-r--r--usr.sbin/slaacd/slaacd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/slaacd/slaacd.c b/usr.sbin/slaacd/slaacd.c
index 0bf1b1d15cd..5696c599754 100644
--- a/usr.sbin/slaacd/slaacd.c
+++ b/usr.sbin/slaacd/slaacd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slaacd.c,v 1.11 2017/05/27 10:52:16 florian Exp $ */
+/* $OpenBSD: slaacd.c,v 1.12 2017/05/27 10:57:23 florian Exp $ */
/*
* Copyright (c) 2017 Florian Obser <florian@openbsd.org>
@@ -217,7 +217,8 @@ main(int argc, char *argv[])
setproctitle(log_procnames[slaacd_process]);
log_procinit(log_procnames[slaacd_process]);
- if ((routesock = socket(PF_ROUTE, SOCK_RAW, 0)) < 0)
+ if ((routesock = socket(PF_ROUTE, SOCK_RAW | SOCK_CLOEXEC |
+ SOCK_NONBLOCK, 0)) < 0)
fatal("route socket");
event_init();
@@ -255,7 +256,7 @@ main(int argc, char *argv[])
if (main_imsg_send_ipc_sockets(&iev_frontend->ibuf, &iev_engine->ibuf))
fatal("could not establish imsg links");
- if ((ioctl_sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
+ if ((ioctl_sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0)
fatal("socket");
#if 0