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.

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
 

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"
 
 
 /*

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

sysdep/unix/io.c

@@ -1253,6 +1253,7 @@ sk_setup(sock *s)
 
   if (sk_is_ipv6(s))
   {
+    if (s->type != SK_IP)
       if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &y, sizeof(y)) < 0)
 	ERR("IPV6_V6ONLY");