[Openvpn-devel] Deprecate --inetd

Message ID 20200723155937.1867-1-arne@rfc2549.org
State Accepted
Headers show
Series
  • [Openvpn-devel] Deprecate --inetd
Related show

Commit Message

Arne Schwabe July 23, 2020, 3:59 p.m.
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>
---
 src/openvpn/options.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Gert Doering July 23, 2020, 5:03 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

I think I am the only one currently using --inetd, and I only
use it on my test server rig because I was curious on whether
it still works.  It does (after some code fixes, back then),
but it is very limited in what it can do, and complicates
the socket.c code quite a bit.  Out with it!

Added Changes.rst entry.

Your patch has been applied to the master branch.

commit 25a422cc60c609cc6927a3fb26bf1fb506dda828
Author: Arne Schwabe
Date:   Thu Jul 23 17:59:37 2020 +0200

     Deprecate --inetd

     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>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index aa7f57b5..5beaba0f 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5871,6 +5871,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)
         {