Deprecate --inetd

This is a corner case of a corner case option. It only works with tcp,
tap and needs special configuration.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200723155937.1867-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20554.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/Changes.rst b/Changes.rst
index 136a20ddf009af8573987020a4d2faa311fe5536..e779f19c1aefa8c9e399674bfc904b6ce77b89e4 100644 (file)
--- a/Changes.rst
+++ b/Changes.rst
@@ -34,6 +34,11 @@ https://community.openvpn.net/openvpn/wiki/DeprecatedOptions
     With the improved and matured data channel cipher negotiation, the use
     of ``ncp-disable`` should not be necessary anymore.
 
+- ``inetd`` has been deprecated
+  This is a very limited and not-well-tested way to run OpenVPN, on TCP
+  and TAP mode only, which complicates the code quite a bit for little gain.
+  To be removed in OpenVPN 2.6 (unless users protest).
+
 - ``no-iv`` has been removed
   This option was made into a NOOP option with OpenVPN 2.4.  This has now
   been completely removed.

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 38714528db76d35c43bc6aef032ec7e57af9738e..1a915e27a47e7e053c49482b7b2da2966d295598 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5802,6 +5802,8 @@ add_option(struct options *options,
     }
     else if (streq(p[0], "inetd") && !p[3])
     {
+        msg(M_WARN, "DEPRECATED OPTION: --inetd mode is deprecated "
+                    "and will be removed in OpenVPN 2.6");
         VERIFY_PERMISSION(OPT_P_GENERAL);
         if (!options->inetd)
         {