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.
This commit is contained in:
parent
d6f027ef34
commit
925aa14912
4 changed files with 6 additions and 5 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <netipsec/ipsec.h>
|
||||
|
||||
#include "nest/bird.h"
|
||||
#include "lib/unix.h"
|
||||
#include "sysdep/unix/unix.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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue