[Openvpn-devel] Remove --ifconfig-pool-linear

Message ID 20200720115156.13322-1-davids@openvpn.net
State Accepted
Delegated to: Gert Doering
Headers show
Series
  • [Openvpn-devel] Remove --ifconfig-pool-linear
Related show

Commit Message

David Sommerseth July 20, 2020, 11:51 a.m.
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 <davids@openvpn.net>
---
 Changes.rst           | 3 +++
 src/openvpn/options.c | 9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

Comments

Gert Doering July 21, 2020, 4:07 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

I take the easy ones today :-)

Looked at the diff (looks good), fixed Changes.rst (if I apply
in non-sent-order, context is wrong), test compiled (just to be
sure).

Your patch has been applied to the master branch.

commit 2d5facaa5f6e6ee3dd2f15c2e7f5510939dd445b
Author: David Sommerseth
Date:   Mon Jul 20 13:51:56 2020 +0200

     Remove --ifconfig-pool-linear

     Signed-off-by: David Sommerseth <davids@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     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 <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/Changes.rst b/Changes.rst
index a1d88a71..57823806 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -42,6 +42,9 @@  https://community.openvpn.net/openvpn/wiki/DeprecatedOptions
   This option will now cause server configurations to not start.  Use
   ``--verify-client-cert none`` instead.
 
+- ``--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 5a81b0c2..be763cfb 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -426,9 +426,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"
@@ -6847,12 +6844,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;