From: David Sommerseth Date: Mon, 20 Jul 2020 11:51:56 +0000 (+0200) Subject: Remove --ifconfig-pool-linear X-Git-Tag: v2.5_beta1~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5facaa5f6e6ee3dd2f15c2e7f5510939dd445b;p=thirdparty%2Fopenvpn.git Remove --ifconfig-pool-linear This option has been deprecated since OpenVPN 2.1 and it has been highlighted in the documentation and log files since OpenVPN 2.4.4. Signed-off-by: David Sommerseth Acked-by: Gert Doering Message-Id: <20200720115156.13322-1-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20504.html Signed-off-by: Gert Doering --- diff --git a/Changes.rst b/Changes.rst index 769fc93da..085c16d28 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 94308a8ee..2221f5128 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;