Skip to content

Commit 549fbd8

Browse files
committed
FreeBSD 12.x workaround for IPv6 ifconfig is needed on 12.4 as well
Commit 16d7f2c tried to remove an FreeBSD 12.x ifconfig inet6 workaround based on the understanding that the upstream fix for bug 248172 went into 12.4, but that was a misread of the code - 12.4 needs the workaround as well, fixed in 13.0. Also extend comment to point to /etc/network.subr, which is the real source of the problematic code if checkyesno ipv6_activate_all_interfaces; then _ipv6_opts="-ifdisabled" elif [ "$1" != "lo0" ]; then <<<< _ipv6_opts="ifdisabled" <<<< fi Trac: 1226 Signed-off-by: Gert Doering <[email protected]> Acked-by: Arne Schwabe <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg26335.html Signed-off-by: Gert Doering <[email protected]>
1 parent 6a05768 commit 549fbd8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/openvpn/tun.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,11 +1105,11 @@ do_ifconfig_ipv6(struct tuntap *tt, const char *ifname, int tun_mtu,
11051105
"generic BSD ifconfig inet6 failed");
11061106

11071107
#if defined(TARGET_FREEBSD) && __FreeBSD_version >= 1200000 \
1108-
&& __FreeBSD_version < 1204000
1109-
/* On FreeBSD 12.0-12.3, there is ipv6_activate_all_interfaces="YES"
1108+
&& __FreeBSD_version < 1300000
1109+
/* On FreeBSD 12.0-12.4, there is ipv6_activate_all_interfaces="YES"
11101110
* in rc.conf, which is not set by default. If it is *not* set,
11111111
* "all new interfaces that are not already up" are configured by
1112-
* devd + /etc/pccard_ether as "inet6 ifdisabled".
1112+
* devd -> /etc/pccard_ether -> /etc/network.subr as "inet6 ifdisabled".
11131113
*
11141114
* The "is this interface already up?" test is a non-zero time window
11151115
* which we manage to hit with our ifconfig often enough to cause

0 commit comments

Comments
 (0)