Commit 925aa149 authored by Jan Moskyto Matejka's avatar Jan Moskyto Matejka
Browse files

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.
parent d6f027ef

sysdep/bsd/setkey.h

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -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");

conf/Makefile

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE