Skip to contentSkip to conversation

Repair --inetd

PATCH In review Gert Doering 2 participants 3 messages Jul 24, 2020 – Jul 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Repair --inetd

commit 25a422cc60 deprecated --inetd, which is still something we want.

Unlike all "usual" deprecated option warnings, we cannot print this at option parsing time, because we need logging to be set up first - otherwise the deprecation warning is sent via the socket (on stdin/stdout) towards the connecting client, totally breaking this mode.

(Which is why we want to deprecate it: too special even for us)

---
 src/openvpn/options.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
src/openvpn/options.c +5 -2
index 1a915e27..a8a9bb97 100644
@@ -2050,6 +2050,11 @@ options_postprocess_verify_ce(const struct options *options, const struct connec
         msg(M_USAGE, "--inetd nowait only makes sense in --dev tap mode");
     }
 
+    if (options->inetd)
+    {
+        msg(M_WARN, "DEPRECATED OPTION: --inetd mode is deprecated "
+                    "and will be removed in OpenVPN 2.6");
+    }
 
     if (options->lladdr && dev != DEV_TYPE_TAP)
     {
@@ -5802,8 +5807,6 @@ 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)
         {
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#1 lore raw

Am 24.07.20 um 20:13 schrieb Gert Doering:

Quoted 8 lines

commit 25a422cc60 deprecated --inetd, which is still something we want.

Unlike all "usual" deprecated option warnings, we cannot print this at option parsing time, because we need logging to be set up first - otherwise the deprecation warning is sent via the socket (on stdin/stdout) towards the connecting client, totally breaking this mode.

(Which is why we want to deprecate it: too special even for us)

#2 lore raw
In reply to Gert Doering

Patch has been applied to the master branch.

commit 96d57b0fc5cc2bf08fdf78141130e3c8092ca4d5

Author: Gert Doering
Date:   Fri Jul 24 20:13:24 2020 +0200
     Repair --inetd

     Signed-off-by: Gert Doering <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg20574.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering