summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjca <jca@openbsd.org>2016-09-26 16:55:21 +0000
committerjca <jca@openbsd.org>2016-09-26 16:55:21 +0000
commitd1a35d0a71826c21ecd507ae282935e37fee06a9 (patch)
treee12ef5eca297cfa9cb435aae72d1710730a4cead
parentTeach ntpd(8) how to use socket status to shutdown the daemon. While at (diff)
downloadwireguard-openbsd-d1a35d0a71826c21ecd507ae282935e37fee06a9.tar.xz
wireguard-openbsd-d1a35d0a71826c21ecd507ae282935e37fee06a9.zip
Pass the flags argument of recvfromto down to the underlying recvmsg
Doesn't matter in iked as recvfromto is only called with flags = 0, but this code tends to be copied. ok sthen@ florian@
-rw-r--r--sbin/iked/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/iked/util.c b/sbin/iked/util.c
index be2c46ba9d9..e7804459e81 100644
--- a/sbin/iked/util.c
+++ b/sbin/iked/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.31 2016/09/04 10:26:02 vgross Exp $ */
+/* $OpenBSD: util.c,v 1.32 2016/09/26 16:55:21 jca Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -366,7 +366,7 @@ recvfromto(int s, void *buf, size_t len, int flags, struct sockaddr *from,
msg.msg_control = &cmsgbuf.buf;
msg.msg_controllen = sizeof(cmsgbuf.buf);
- if ((ret = recvmsg(s, &msg, 0)) == -1)
+ if ((ret = recvmsg(s, &msg, flags)) == -1)
return (-1);
*fromlen = from->sa_len;