tun-ipv6 is a no-op nowadays, and we print a warning to let users know -
which is not helpful for server-pushed tun-ipv6 (which might be the
result of --server-ipv6 automatically pushing this). So, remove the
warning if parsing pushed options.
Also, remove the VERIFY_PERMISSION() call here which has side effects
on the "which class of options got pushed, do we need to act on them
later on?" flag set.
v2: use existing pull_mode flag
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20171111142230.3288-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/search?l=mid&q=20171111142230.3288-1-gert@greenie.muc.de
Signed-off-by: Gert Doering <gert@greenie.muc.de>
... | ... |
@@ -5233,8 +5233,10 @@ add_option(struct options *options, |
5233 | 5233 |
} |
5234 | 5234 |
else if (streq(p[0], "tun-ipv6") && !p[1]) |
5235 | 5235 |
{ |
5236 |
- VERIFY_PERMISSION(OPT_P_UP); |
|
5237 |
- msg(M_WARN, "Note: option tun-ipv6 is ignored because modern operating systems do not need special IPv6 tun handling anymore."); |
|
5236 |
+ if (!pull_mode) |
|
5237 |
+ { |
|
5238 |
+ msg(M_WARN, "Note: option tun-ipv6 is ignored because modern operating systems do not need special IPv6 tun handling anymore."); |
|
5239 |
+ } |
|
5238 | 5240 |
} |
5239 | 5241 |
#ifdef ENABLE_IPROUTE |
5240 | 5242 |
else if (streq(p[0], "iproute") && p[1] && !p[2]) |