From 925aa14912329bafff38a9e5a3f675809ff97785 Mon Sep 17 00:00:00 2001
From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Tue, 17 May 2016 13:19:18 +0200
Subject: 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.
---
 sysdep/unix/io.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sysdep/unix')

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)
-- 
cgit v1.2.3