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.

diff --git a/conf/Makefile b/conf/Makefile
index 76fd496a678a54db076c9da500d9317ca134d766..c1a906e3e77ba5f1766e30f77a65115621427c4a 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -21,7 +21,7 @@ $(o)cf-parse.tab.c: $(o)cf-parse.y
        $(BISON) $(BISON_DEBUG) -dv -pcf_ -b $(@:.tab.c=) $<
 
 $(o)cf-lex.c: $(s)cf-lex.l
-       $(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o $@ $<
+       $(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o$@ $<
 
 $(o)cf-lex.o: $(o)cf-parse.tab.h $(o)keywords.h
 

diff --git a/sysdep/bsd/setkey.h b/sysdep/bsd/setkey.h
index d0ec66208e7d1a99fa9b99850e19ba658eb407e4..3bcd86231a2e6d4778064e8f341b5d18cfd01c90 100644 (file)
--- a/sysdep/bsd/setkey.h
+++ b/sysdep/bsd/setkey.h
@@ -11,7 +11,7 @@
 #include <netipsec/ipsec.h>
 
 #include "nest/bird.h"
-#include "lib/unix.h"
+#include "sysdep/unix/unix.h"
 
 
 /*

diff --git a/sysdep/bsd/sysio.h b/sysdep/bsd/sysio.h
index 6c20733fda5ce5e1017ce4bd36cb28e352cb9123..57c45bcf1e3fadd38b63bdfa23913403f7f02c51 100644 (file)
--- a/sysdep/bsd/sysio.h
+++ b/sysdep/bsd/sysio.h
@@ -196,7 +196,7 @@ sk_prepare_ip_header(sock *s, void *hdr, int dlen)
 
 #if defined(__FreeBSD__)
 #define USE_MD5SIG_SETKEY
-#include "lib/setkey.h"
+#include "sysdep/bsd/setkey.h"
 #endif
 
 int

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 48f368a4c4e0a81c02c6650dc2a85f6a3c233156..5ec728af0bf67d98a35cef9a1a7512ca5893ce3a 100644 (file)
--- 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)