diff --git a/Changes.rst b/Changes.rst index 769fc93d..085c16d2 100644 --- a/Changes.rst +++ b/Changes.rst @@ -38,6 +38,9 @@ https://community.openvpn.net/openvpn/wiki/DeprecatedOptions This option was made into a NOOP option with OpenVPN 2.4. This has now been completely removed. +- ``--ifconfig-pool-linear`` has been removed + This option is removed. Use ``--topology p2p`` instead. + User-visible Changes -------------------- - If multiple connect handlers are used (client-connect, ccd, connect diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 94308a8e..2221f512 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -424,9 +424,6 @@ static const char usage_message[] = " client instance.\n" "--ifconfig-pool start-IP end-IP [netmask] : Set aside a pool of subnets\n" " to be dynamically allocated to connecting clients.\n" - "--ifconfig-pool-linear : (DEPRECATED) Use individual addresses rather \n" - " than /30 subnets\n in tun mode. Not compatible with\n" - " Windows clients.\n" "--ifconfig-pool-persist file [seconds] : Persist/unpersist ifconfig-pool\n" " data to file, at seconds intervals (default=600).\n" " If seconds=0, file will be treated as read-only.\n" @@ -6861,12 +6858,6 @@ add_option(struct options *options, options->ifconfig_pool_persist_refresh_freq = positive_atoi(p[2]); } } - else if (streq(p[0], "ifconfig-pool-linear") && !p[1]) - { - VERIFY_PERMISSION(OPT_P_GENERAL); - options->topology = TOP_P2P; - msg(M_WARN, "DEPRECATED OPTION: --ifconfig-pool-linear, use --topology p2p instead"); - } else if (streq(p[0], "ifconfig-ipv6-pool") && p[1] && !p[2]) { const int lev = M_WARN;