summaryrefslogtreecommitdiff
path: root/sysdep/unix
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@ucw.cz>2016-05-17 13:19:18 +0200
committerJan Moskyto Matejka <mq@ucw.cz>2016-05-24 12:12:14 +0200
commit925aa14912329bafff38a9e5a3f675809ff97785 (patch)
treecc088185f648730978ba6d3eeb72afb9d5420db9 /sysdep/unix
parentd6f027ef3474bbc93d06865b0031bb6aae4fc031 (diff)
After-master-merge simple fixes.
BSD lib/setkey.h and lib/sysio.h #include fixes. OpenBSD's flex needs -o param without space. V6ONLY for SK_IP fix.
Diffstat (limited to 'sysdep/unix')
-rw-r--r--sysdep/unix/io.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 48f368a4..5ec728af 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1253,8 +1253,9 @@ sk_setup(sock *s)
if (sk_is_ipv6(s))
{
- if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &y, sizeof(y)) < 0)
- ERR("IPV6_V6ONLY");
+ if (s->type != SK_IP)
+ if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &y, sizeof(y)) < 0)
+ ERR("IPV6_V6ONLY");
if (s->flags & SKF_LADDR_RX)
if (sk_request_cmsg6_pktinfo(s) < 0)