From: Arne Schwabe Date: Thu, 23 Jul 2020 15:59:37 +0000 (+0200) Subject: Deprecate --inetd X-Git-Tag: v2.5_beta1~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25a422cc60;p=thirdparty%2Fopenvpn.git 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 Acked-by: Gert Doering 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 --- diff --git a/Changes.rst b/Changes.rst index 136a20ddf..e779f19c1 100644 --- 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 38714528d..1a915e27a 100644 --- 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) {